X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fweb.pp;h=ca238672d7a5eb6ad0a7ccfe48dcc4f4c41bf375;hb=178c25f7efba526cf342d1ec047592714355b554;hp=b4a198bcb022fbe27fab06de52071a7695cc197e;hpb=355a8f07e8eb7052cf51e0193b24ea829bac1a4c;p=mirror%2Fdsa-puppet.git diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp index b4a198bcb..ca238672d 100644 --- a/modules/salsa/manifests/web.pp +++ b/modules/salsa/manifests/web.pp @@ -7,6 +7,7 @@ class salsa::web inherits salsa { ssl::service { [ 'salsa.debian.org', + 'registry.salsa.debian.org', 'signup.salsa.debian.org', 'webhook.salsa.debian.org', 'pages.debian.net', @@ -19,15 +20,23 @@ 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': + apache2::site { '010-registry.salsa.debian.org': ensure => absent, } + apache2::site { '011-registry.salsa.debian.org': + site => 'registry.salsa.debian.org', + content => template('salsa/apache-registry.salsa.debian.org.conf.erb'), + } + apache2::site { '010-signup.salsa.debian.org': ensure => absent, } + apache2::site { '011-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': + apache2::site { '010-webhook.salsa.debian.org': ensure => absent, } + apache2::site { '011-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': + apache2::site { '010-pages.debian.net': ensure => absent, } + apache2::site { '011-pages.debian.net': site => 'pages.debian.net', content => template('salsa/apache-pages.debian.net.conf.erb'), }