From 2c3584caed404f1d2c659f4721652385c315c072 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Mon, 2 Jan 2012 22:03:35 -0800
Subject: [PATCH] add some comments/fixes from review with micah
---
manifests/debian.pp | 1 +
manifests/fastcgi.pp | 3 ---
manifests/fcgid.pp | 5 +++--
manifests/init.pp | 3 ++-
manifests/milter.pp | 2 ++
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 0712344..4c8b3c1 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -27,6 +27,7 @@ class sympa::debian {
}
}
+# move these to dirs
class sympa::fastcgi::debian {
package {
[ libapache2-mod-fastcgi, libcgi-fast-perl ]:
diff --git a/manifests/fastcgi.pp b/manifests/fastcgi.pp
index 34ad68f..e95db3a 100644
--- a/manifests/fastcgi.pp
+++ b/manifests/fastcgi.pp
@@ -25,9 +25,6 @@ class sympa::fastcgi {
apache2::module {
"fastcgi": ensure => present, require_package => "libapache2-mod-fastcgi";
- # we need a way to set things in fcgid.conf, but the apache2 module
- # we're currently (Aug 2011) using doesn't support that, so we deliver
- # it as a file below
"fcgid": ensure => absent;
}
diff --git a/manifests/fcgid.pp b/manifests/fcgid.pp
index ce632b0..d18af7d 100644
--- a/manifests/fcgid.pp
+++ b/manifests/fcgid.pp
@@ -10,17 +10,18 @@ class sympa::fcgid {
# we're currently (Aug 2011) using doesn't support that, so we deliver
# it as a file below
"fcgid": ensure => present, require_package => "libapache2-mod-fcgid";
- # disable fastcgi FIXME: too much?
"fastcgi": ensure => absent;
}
- # FIXME: this is Riseup specific, figure out where to move it
file {
# NOTE: as mentioned above it would be better if the apache2 module
# could handle setting things in the module conf files for us, but for
# now we just deliver the file
+ # FIXME: a newer augeas supports making the changes that this file delivers
+ # move to it once we have it backported
"/etc/apache2/mods-available/fcgid.conf":
source => "$fileserver/apache2/fcgid.conf",
owner => root, group => root, mode => 0644;
}
}
+
diff --git a/manifests/init.pp b/manifests/init.pp
index 4a0ae10..030affa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,9 +3,10 @@ class sympa {
case $operatingsystem {
debian: { include sympa::debian }
mageia: { include sympa::mageia }
- default: { include sympa::default }
+ default: { err("This operating system not supported") }
}
+ #FIXME: globals suck, use the right method (see the dovecot module)
if $use_munin { include sympa::munin }
if $use_nagios { include sympa::nagios }
diff --git a/manifests/milter.pp b/manifests/milter.pp
index 0d5e4a8..ecf4850 100644
--- a/manifests/milter.pp
+++ b/manifests/milter.pp
@@ -1,3 +1,5 @@
+# FIXME: maybe this shouldn't be in the sympa class?
+
class sympa::samilter {
case $operatingsystem {
debian: { include sympa::samilter::debian }
--
GitLab