Merge branch 'mtatest'

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

diff --git a/modules/roles/manifests/cdimage_search.pp b/modules/roles/manifests/cdimage_search.pp
index 162edcf..69269ee 100644 (file)
--- a/modules/roles/manifests/cdimage_search.pp
+++ b/modules/roles/manifests/cdimage_search.pp
@@ -1,10 +1,15 @@
 class roles::cdimage_search {
-       include apache2::proxy_http
+  include apache2
+  include apache2::proxy_http
+  include apache2::ssl
 
-       package { 'debian.org-cdimage-search.debian.org': ensure => installed, }
+  package { 'debian.org-cdimage-search.debian.org': ensure => installed, }
 
-       apache2::site { '010-cdimage-search.debian.org':
-               site   => 'cdimage-search.debian.org',
-               content => template('roles/apache-cdimage-search.debian.org.conf.erb')
-       }
+  ssl::service { 'cdimage-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+  apache2::site { '010-cdimage-search.debian.org':
+    site    => 'cdimage-search.debian.org',
+    content => template('roles/apache-cdimage-search.debian.org.conf.erb')
+  }
+
+  onion::service { 'cdimage-search.debian.org': port => 80, target_address => 'cdimage-search.debian.org', target_port => 80, direct => true }
 }