one accepts only TERM, the other only INT

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f58b710..6235ed3 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,7 +6,7 @@ class apache2 {
                "logrotate": ensure => installed;
        }
 
-        case $php {
+        case $php5 {
                 "true": { package {
                                "php5-suhosin": ensure => installed;
                        }
@@ -129,4 +129,9 @@ class apache2 {
                command => "/etc/init.d/apache2 force-reload",
                refreshonly => true,
        }
+        @ferm::rule { "dsa-apache":
+                domain          => "(ip ip6)",
+                description     => "Allow web access",
+                rule            => "&SERVICE(tcp, 80)"
+        }
 }