move exim vs. postfix, heavy vs. not, into hiera

[mirror/dsa-puppet.git] / modules / roles / manifests / dgit_git.pp

diff --git a/modules/roles/manifests/dgit_git.pp b/modules/roles/manifests/dgit_git.pp
index 8614b18..7ddf0ed 100644 (file)
--- a/modules/roles/manifests/dgit_git.pp
+++ b/modules/roles/manifests/dgit_git.pp
@@ -1,12 +1,14 @@
 class roles::dgit_git {
-       ssl::service { 'git.dgit.debian.org':
-               notify => Service['apache2'],
-               tlsaport => [],
-       }
+  include apache2
+  include roles::dgit_sync_target
 
-       apache2::site { '010-git.dgit.debian.org':
-               site    => 'git.dgit.debian.org',
-               source => 'puppet:///modules/roles/dgit/git.dgit.debian.org',
-       }
+  ssl::service { 'git.dgit.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
+  apache2::site { '010-git.dgit.debian.org':
+    site   => 'git.dgit.debian.org',
+    source => 'puppet:///modules/roles/dgit/git.dgit.debian.org',
+  }
 }