disallow puppet access from clients for now

[mirror/dsa-puppet.git] / modules / roles / manifests / debconf_wafer.pp

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 92223d9..d64d06a 100644 (file)
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,5 +1,6 @@
 class roles::debconf_wafer {
        include apache2::ssl
+       include apache2::expires
 
        package { 'libapache2-mod-wsgi-py3': ensure => installed, }
        apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
@@ -8,10 +9,37 @@ class roles::debconf_wafer {
                notify  => Exec['service apache2 reload'],
                key => true,
        }
-
        apache2::site { '010-wafertest.debconf.org':
                site    => 'wafertest.debconf.org',
                source => 'puppet:///modules/roles/debconf_wafer/wafertest.debconf.org',
        }
+
+       ssl::service { 'debconf18.debconf.org':
+               notify  => Exec['service apache2 reload'],
+               key => true,
+               ensure => absent,
+       }
+       apache2::site { '010-debconf18.debconf.org':
+               site    => 'debconf18.debconf.org',
+               ensure  => absent,
+       }
+
+       ssl::service { 'debconf19.debconf.org':
+               notify  => Exec['service apache2 reload'],
+               key => true,
+       }
+       apache2::site { '010-debconf19.debconf.org':
+               site    => 'debconf19.debconf.org',
+               source => 'puppet:///modules/roles/debconf_wafer/debconf19.debconf.org',
+       }
+
+       ssl::service { 'debconf20.debconf.org':
+               notify  => Exec['service apache2 reload'],
+               key => true,
+       }
+       apache2::site { '010-debconf20.debconf.org':
+               site    => 'debconf20.debconf.org',
+               source => 'puppet:///modules/roles/debconf_wafer/debconf20.debconf.org',
+       }
 }