ferm::conf - include ferm

[mirror/dsa-puppet.git] / modules / salsa / manifests / web.pp

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index b061f86..b4a198b 100644 (file)
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -5,7 +5,12 @@ class salsa::web inherits salsa {
        include apache2::rewrite
        include apache2::ssl
 
-       ssl::service { 'salsa.debian.org':
+       ssl::service { [
+               'salsa.debian.org',
+               'signup.salsa.debian.org',
+               'webhook.salsa.debian.org',
+               'pages.debian.net',
+               ]:
                notify  => Exec['service apache2 reload'],
                key => true,
        }
@@ -14,10 +19,16 @@ class salsa::web inherits salsa {
                site    => 'salsa.debian.org',
                content => template('salsa/apache-salsa.debian.org.conf.erb'),
        }
+       apache2::site { '010-signup.salsa.debian.org':
+               site    => 'signup.salsa.debian.org',
+               content => template('salsa/apache-signup.salsa.debian.org.conf.erb'),
+       }
+       apache2::site { '010-webhook.salsa.debian.org':
+               site    => 'webhook.salsa.debian.org',
+               content => template('salsa/apache-webhook.salsa.debian.org.conf.erb'),
+       }
        apache2::site { '010-pages.debian.net':
                site    => 'pages.debian.net',
                content => template('salsa/apache-pages.debian.net.conf.erb'),
        }
-
-
 }