X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdebtags.pp;h=53147ebec2258b1a9c8bd5a7f3d112eeb5a7f9a4;hb=a77153dac35e1cff12334d56a4c9fcd53586e58f;hp=50328095f5b48409a0f3cd096573ebbf2fc3d99e;hpb=08a5df3e8e1957dbc22e97f80e13861b4865aacd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index 50328095f..53147ebec 100644
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,14 +1,33 @@
-class roles::debtags {
-	include apache2::ssl
-	package { 'libapache2-mod-wsgi': ensure => installed, }
-
-	ssl::service { 'debtags.debian.org':
-		notify => Service['apache2'],
-		key => true,
-	}
-
-	apache2::site { '010-debtags.debian.org':
-		site    => 'debtags.debian.org',
-		source => 'puppet:///modules/roles/debtags/debtags.debian.org',
-	}
+# debtags.debian.org 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::debtags (
+  String  $db_address,
+  Integer $db_port,
+) {
+  include apache2
+  include apache2::ssl
+  include roles::sso_rp
+
+  package { 'libapache2-mod-wsgi-py3': ensure => installed, }
+  apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
+
+  ssl::service { 'debtags.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  apache2::site { '010-debtags.debian.org':
+    site   => 'debtags.debian.org',
+    source => 'puppet:///modules/roles/debtags/debtags.debian.org',
+  }
+
+  @@postgres::cluster::hba_entry { "debtags-${::fqdn}":
+    tag      => "postgres::cluster::${db_port}::hba::${db_address}",
+    pg_port  => $db_port,
+    database => 'debtags',
+    user     => 'debtags',
+    address  => $base::public_addresses,
+  }
 }