people -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93b87a7..916a4b3 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -75,8 +75,6 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  people:
-    - paradis.debian.org
   popcon:
     - pinel.debian.org
   pubsub:

diff --git a/hieradata/nodes/paradis.debian.org.yaml b/hieradata/nodes/paradis.debian.org.yaml
new file mode 100644 (file)
index 0000000..f22e5b7
--- /dev/null
+++ b/hieradata/nodes/paradis.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::people

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a10af2a..1c4dc9d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -62,11 +62,6 @@ class roles {
                include roles::git_master
        }
 
-       if has_role('people') {
-               ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-               onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
-       }
-
        if has_role('www_master') {
                include roles::www_master
        }

diff --git a/modules/roles/manifests/people.pp b/modules/roles/manifests/people.pp
new file mode 100644 (file)
index 0000000..713f1a1
--- /dev/null
+++ b/modules/roles/manifests/people.pp
@@ -0,0 +1,5 @@
+class roles::people {
+  include apache2
+  ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+  onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
+}