Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some clean up + Eclipse project file #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

some clean up + Eclipse project file #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5a90f4
adding Eclipse project file and module dependencies
kreczko Aug 16, 2013
f24b254
replacing double quotes with single quotes where not needed (Puppet s…
kreczko Aug 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ summary 'Resources for managing a gLite Virtual Organization Membership Service
description 'This modules provides classes and definitions required to manage and properly configure a gLite service or client supporting authorization using the gLite Virtual Organization Membership Service (VOMS).'
project_page 'http://glite.org'
dependency 'puppetlabs/stdlib', '>=2.2.1'
dependency 'puppetlabs-mysql', '>=0.6.1'
20 changes: 10 additions & 10 deletions manifests/admin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,33 +77,33 @@

file{"/etc/voms-admin-puppet/voms-admin-add-admin-${vo}.sh":
ensure => file,
content => template("voms/voms-admin-add-admin.sh.erb"),
mode => "0700",
content => template('voms/voms-admin-add-admin.sh.erb'),
mode => '0700',
}


file{"/etc/voms-admin-puppet/voms-admin-remove-${vo}.sh":
ensure => file,
content => template("voms/voms-admin-remove.sh.erb"),
mode => "0700",
content => template('voms/voms-admin-remove.sh.erb'),
mode => '0700',
}

file{"/etc/voms-admin-puppet/voms-admin-create-${vo}.sh":
ensure => file,
content => template("voms/voms-admin-create.sh.erb"),
mode => "0700",
content => template('voms/voms-admin-create.sh.erb'),
mode => '0700',
}

file{"/etc/voms-admin-puppet/voms-admin-upgrade-${vo}.sh":
ensure => file,
content => template("voms/voms-admin-upgrade.sh.erb"),
mode => "0700",
content => template('voms/voms-admin-upgrade.sh.erb'),
mode => '0700',
}

file{"/etc/voms-admin-puppet/voms-admin-install-${vo}.sh":
ensure => file,
content => template("voms/voms-admin-install.sh.erb"),
mode => "0700",
content => template('voms/voms-admin-install.sh.erb'),
mode => '0700',
notify => Exec["/etc/voms-admin-puppet/voms-admin-install-${vo}.sh"]
}

Expand Down
18 changes: 9 additions & 9 deletions manifests/admin/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
$tomcat_filelimit = $voms::params::tomcat_filelimit
) inherits voms::params {

file{"/etc/voms-admin-puppet":
file{'/etc/voms-admin-puppet':
ensure => directory,
purge => true,
recurse => true
}
file{"/etc/voms-admin-puppet/README":
file{'/etc/voms-admin-puppet/README':
ensure => file,
content => template('voms/README.erb'),
require => File["/etc/voms-admin-puppet"]
require => File['/etc/voms-admin-puppet']
}
file{"/etc/grid-security/tomcat-hostcert.pem":
file{'/etc/grid-security/tomcat-hostcert.pem':
ensure => file,
source => "file:///etc/grid-security/hostcert.pem",
source => 'file:///etc/grid-security/hostcert.pem',
mode => 0644,
owner => $tomcatuser,
group => root,
notify => Service['tomcat']
}
file{"/etc/grid-security/tomcat-hostkey.pem":
file{'/etc/grid-security/tomcat-hostkey.pem':
ensure => file,
source => "file:///etc/grid-security/hostkey.pem",
source => 'file:///etc/grid-security/hostkey.pem',
mode => 0400,
owner => $tomcatuser,
group => root,
Expand All @@ -47,7 +47,7 @@
group => root,
notify => Service['tomcat']
}
file{"/usr/share/voms-admin":
file{'/usr/share/voms-admin':
ensure => directory,
}

Expand Down Expand Up @@ -95,7 +95,7 @@
notify => Service['tomcat']
}
if $tomcat_filelimit {
file{"/etc/security/limits.d/90-tomcat.conf":
file{'/etc/security/limits.d/90-tomcat.conf':
ensure => file,
owner => root,
group => root,
Expand Down
16 changes: 8 additions & 8 deletions manifests/admin/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
require => Yumrepo['emi']
}

yumrepo{"emi":
descr => "EMI Repository for voms-admin at least.",
yumrepo{'emi':
descr => 'EMI Repository for voms-admin at least.',
baseurl => "${emirepo}",
gpgcheck => 0,
enabled => 1,
Expand All @@ -21,8 +21,8 @@
require => Yumrepo['emiupdates']

}
yumrepo{"emiupdates":
descr => "EMI Updates Repository for voms-admin at least.",
yumrepo{'emiupdates':
descr => 'EMI Updates Repository for voms-admin at least.',
baseurl => "${emiupdatesrepo}",
gpgcheck => 0,
enabled => 1,
Expand All @@ -31,13 +31,13 @@

}

file{"/etc/yum.repos.d/emi.repo":
file{'/etc/yum.repos.d/emi.repo':
ensure => file,
require => Yumrepo["emi"]
require => Yumrepo['emi']
}
file{"/etc/yum.repos.d/emiupdates.repo":
file{'/etc/yum.repos.d/emiupdates.repo':
ensure => file,
require => Yumrepo["emiupdates"]
require => Yumrepo['emiupdates']
}


Expand Down
24 changes: 12 additions & 12 deletions manifests/core.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
define voms::core($vo=$name,
$port,
$issuer=$::fqdn,
$vomstimeout="86400",
$vomstimeout='86400',
$sqlhost='localhost',
$sqldbname="${name}_db",
$sqlport=3306,
Expand All @@ -57,9 +57,9 @@

file{"/etc/voms/${vo}":
ensure => directory,
mode => "0755",
owner => "root",
group => "root",
mode => '0755',
owner => 'root',
group => 'root',
purge => true,
recurse => true,
require => File['/etc/voms']
Expand All @@ -68,20 +68,20 @@
file{"/etc/voms/${vo}/voms.conf":
ensure => file,
content => template('voms/voms.conf.erb'),
mode => "0644",
owner => "root",
group => "root",
notify => Service["voms"],
mode => '0644',
owner => 'root',
group => 'root',
notify => Service['voms'],
require => File["/etc/voms/${vo}"]
}
# The package creates the voms user below.
file{"/etc/voms/${vo}/voms.pass":
ensure => file,
content => "${sqlpwd}\n",
mode => "0640",
owner => "voms",
group => "voms",
notify => Service["voms"],
mode => '0640',
owner => 'voms',
group => 'voms',
notify => Service['voms'],
require => [File["/etc/voms/${vo}"],Package['voms-server']]
}
@@database_user{"${sqlusername}@${::fqdn}":
Expand Down
8 changes: 4 additions & 4 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Install voms-clients package and sets up a few directories.
#
class voms::install {
package { "voms-clients":
package { 'voms-clients':
ensure => latest,
require => Package["lcg-CA"],
require => Package['lcg-CA'],
}

file{'/etc/grid-security/vomsdir':
Expand All @@ -15,7 +15,7 @@
mode => 0755,
purge => true,
recurse => true,
require => Package["lcg-CA"],
require => Package['lcg-CA'],
}
file{'/etc/vomses':
ensure => directory,
Expand All @@ -24,7 +24,7 @@
mode => 0755,
purge => true,
recurse => true,
require => Package["lcg-CA"],
require => Package['lcg-CA'],
}

}
4 changes: 4 additions & 0 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
{
"name": "puppetlabs/stdlib",
"version_requirement": "\u003e\u003d2.2.1"
},
{
"name": "puppetlabs/mysql",
"version_requirement": "\u003e\u003d0.6.1"
}
],
"types": [],
Expand Down