X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fcdimage_search.pp;h=69269eef475a640526ce15e6524260bcdf980930;hb=3b69fa2404c0c3b4c98a840192bd676b9d48639c;hp=9c1859ceb1d581189809b1044407afbb41602ab3;hpb=e9830a97cadd030be3c0ed1e2d312b4ceaedcca9;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/cdimage_search.pp b/modules/roles/manifests/cdimage_search.pp index 9c1859ceb..69269eef4 100644 --- a/modules/roles/manifests/cdimage_search.pp +++ b/modules/roles/manifests/cdimage_search.pp @@ -1,14 +1,15 @@ class roles::cdimage_search { - include apache2::proxy_http - include apache2::ssl + 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, } - 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') - } + 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 } + onion::service { 'cdimage-search.debian.org': port => 80, target_address => 'cdimage-search.debian.org', target_port => 80, direct => true } }