aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-12-09 12:34:17 +0000
committerMichael Scherer <misc@mageia.org>2010-12-09 12:34:17 +0000
commitb1cba1f575fc403885a8e4e9fed199c6bb528efe (patch)
treebdd6c97238fd0f2ce4324007733cbfac23e9c938
parent470115d1f9f04432d36fbd018c901f7adf5fa9c3 (diff)
downloadpuppet-b1cba1f575fc403885a8e4e9fed199c6bb528efe.tar
puppet-b1cba1f575fc403885a8e4e9fed199c6bb528efe.tar.gz
puppet-b1cba1f575fc403885a8e4e9fed199c6bb528efe.tar.bz2
puppet-b1cba1f575fc403885a8e4e9fed199c6bb528efe.tar.xz
puppet-b1cba1f575fc403885a8e4e9fed199c6bb528efe.zip
- move everything in a subclass
-rw-r--r--modules/sympa/manifests/init.pp123
1 files changed, 62 insertions, 61 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 92334505..8e7c5b6a 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -1,66 +1,67 @@
class sympa {
+ class server {
+ # perl-CGI-Fast is needed for fast cgi
+ # perl-Socket6 is required by perl-IO-Socket-SSL
+ # (optional requirement)
+ $package_list = ['sympa', 'sympa-www', 'perl-CGI-Fast',
+ 'perl-Socket6']
- # perl-CGI-Fast is needed for fast cgi
- # perl-Socket6 is required by perl-IO-Socket-SSL
- # (optional requirement)
- $package_list = ['sympa', 'sympa-www', 'perl-CGI-Fast',
- 'perl-Socket6']
-
- package { $package_list:
- ensure => installed;
- }
-
- # sympa script start 5 differents script, I am not
- # sure that puppet will correctly handle this
- service { "sympa":
- ensure => running,
- hasstatus => true,
- subscribe => [ Package["sympa"]]
- }
-
- $password = extlookup("sympa_password",'x')
- $ldap_passwd = extlookup("sympa_ldap",'x')
-
- @@postgresql::user { 'sympa':
- password => $password,
- }
-
- file { '/etc/sympa/sympa.conf':
- ensure => present,
- # should be cleaner to have it root owned, but puppet do not support acl
- # and in any case, config will be reset if it change
- owner => sympa,
- group => apache,
- mode => 640,
- content => template("sympa/sympa.conf")
- }
-
- file { '/etc/sympa/auth.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- content => template("sympa/auth.conf")
- }
-
-
- include apache::mod_fcgid
- apache::webapp_other{"sympa":
- webapp_file => "sympa/webapp_sympa.conf",
- }
-
- apache::vhost_other_app { "ml.$domain":
- vhost_file => "sympa/vhost_ml.conf",
- }
-
- @@postgresql::database { 'sympa':
- description => "Sympa database",
- user => "sympa",
- require => Postgresql::User["sympa"]
- }
-
- subversion::snapshot { "/etc/sympa/web_tt2":
- source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk"
+ package { $package_list:
+ ensure => installed;
+ }
+
+ # sympa script start 5 differents script, I am not
+ # sure that puppet will correctly handle this
+ service { "sympa":
+ ensure => running,
+ hasstatus => true,
+ subscribe => [ Package["sympa"]]
+ }
+
+ $password = extlookup("sympa_password",'x')
+ $ldap_passwd = extlookup("sympa_ldap",'x')
+
+ @@postgresql::user { 'sympa':
+ password => $password,
+ }
+
+ file { '/etc/sympa/sympa.conf':
+ ensure => present,
+ # should be cleaner to have it root owned, but puppet do not support acl
+ # and in any case, config will be reset if it change
+ owner => sympa,
+ group => apache,
+ mode => 640,
+ content => template("sympa/sympa.conf")
+ }
+
+ file { '/etc/sympa/auth.conf':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ content => template("sympa/auth.conf")
+ }
+
+
+ include apache::mod_fcgid
+ apache::webapp_other{"sympa":
+ webapp_file => "sympa/webapp_sympa.conf",
+ }
+
+ apache::vhost_other_app { "ml.$domain":
+ vhost_file => "sympa/vhost_ml.conf",
+ }
+
+ @@postgresql::database { 'sympa':
+ description => "Sympa database",
+ user => "sympa",
+ require => Postgresql::User["sympa"]
+ }
+
+ subversion::snapshot { "/etc/sympa/web_tt2":
+ source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk"
+ }
}
}