aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sympa/manifests/server.pp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/sympa/manifests/server.pp')
-rw-r--r--modules/sympa/manifests/server.pp20
1 files changed, 12 insertions, 8 deletions
diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp
index daed4e07..bcdda789 100644
--- a/modules/sympa/manifests/server.pp
+++ b/modules/sympa/manifests/server.pp
@@ -10,12 +10,17 @@ class sympa::server(
'perl-CGI-Fast',
'perl-Socket6']: }
- # sympa script start 5 differents script, I am not
+ # sympa script starts 5 different scripts; I am not
# sure that puppet will correctly handle this
service { 'sympa':
subscribe => [ Package['sympa'], File['/etc/sympa/sympa.conf']]
}
+ service { 'sympa-outgoing':
+ ensure => running,
+ require => Service['sympa']
+ }
+
$pgsql_password = extlookup('sympa_pgsql','x')
$ldap_password = extlookup('sympa_ldap','x')
@@ -30,8 +35,8 @@ class sympa::server(
$vhost = $sympa::variable::vhost
file { '/etc/sympa/sympa.conf':
- # 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
+ # should be cleaner to have it root owned, but puppet does not support acls
+ # and in any case, config will be reset if it changes
owner => 'sympa',
group => 'apache',
mode => '0640',
@@ -56,9 +61,9 @@ class sympa::server(
content => template('sympa/vhost_ml.conf'),
}
- subversion::snapshot { '/etc/sympa/web_tt2':
- source => 'svn://svn.mageia.org/svn/web/templates/sympa/trunk',
- }
+# git::snapshot { '/etc/sympa/web_tt2':
+# source => "git://git.${::domain}/web/templates/sympa",
+# }
file { ['/etc/sympa/lists_xml/',
'/etc/sympa/scenari/',
@@ -75,8 +80,6 @@ class sympa::server(
source => 'puppet:///modules/sympa/scenari/open_web_only_notify';
'/etc/sympa/scenari/unsubscribe.open_web_only_notify':
source => 'puppet:///modules/sympa/scenari/open_web_only_notify';
- '/etc/sympa/scenari/send.subscriber_moderated':
- source => 'puppet:///modules/sympa/scenari/subscriber_moderated';
'/etc/sympa/scenari/create_list.forbidden':
source => 'puppet:///modules/sympa/scenari/forbidden';
'/etc/sympa/topics.conf':
@@ -96,4 +99,5 @@ class sympa::server(
ensure => directory,
owner => 'sympa',
}
+
}