X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebconf_wafer.pp;h=b0c2c5ed59a3b1614494628545eb399e46b24323;hb=4842561dfba794d10fa9294378fa0271a76ceb65;hp=1fe443c4a88c222e457b6de737f97d8bc74a1704;hpb=f0c798a0f10ddaa8aa51b3393a92e6e504760ec9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 1fe443c4a..b0c2c5ed5 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,18 +1,63 @@
-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'] }
-
-	ssl::service { 'wafertest.debconf.org':
-		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',
-	}
+# debconf's wafer role
+
+# @param db_address     hostname of the postgres server for this service
+# @param db_port        port of the postgres server for this service
+class roles::debconf_wafer (
+  String  $db_address,
+  Integer $db_port,
+) {
+  include apache2
+  include apache2::ssl
+  include apache2::expires
+
+  include roles::sso_rp
+
+  package { 'libapache2-mod-wsgi-py3': ensure => installed, }
+  apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
+
+  ssl::service { 'wafertest.debconf.org':
+    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':
+    ensure => absent,
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-debconf18.debconf.org':
+    ensure => absent,
+    site   => 'debconf18.debconf.org',
+  }
+
+  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',
+  }
+
+  @@postgres::cluster::hba_entry { "debconf-wafer-${::fqdn}":
+    tag      => "postgres::cluster::${db_port}::hba::${db_address}",
+    pg_port  => $db_port,
+    user     => ['debconf18', 'debconf19', 'debconf20', 'wafertest'],
+    database => 'sameuser',
+    address  => $base::public_addresses,
+  }
 }