# HG changeset patch # User IBBoard # Date 1581797301 0 # Node ID 6668c07088870fed4e30b8528a19e6e3b0cf18d9 # Parent af7df930a6707b5f27c93da356ab2e71a1d697ba Remove unused "http" module Everyone should be using HTTPS anyway these days and we don't even use the definition for HTTP->HTTPS redirects. diff -r af7df930a670 -r 6668c0708887 modules/website/manifests/http.pp --- a/modules/website/manifests/http.pp Sat Feb 15 19:07:11 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -define website::http( - $docroot = undef, - $docroot_owner = 'root', - $docroot_group = 'root', - $serveraliases = [], - $ensure = 'present', - $custom_fragment = undef, - Optional[String] $proxy_fragment = $custom_fragment, - ) { - if ! defined(Class['website']) { - fail('You must include the website base class before using any website defined resources') - } - - $shortname = domain_to_short_name($name) - $logpart = $shortname - - if $docroot == undef { - $siteroot = "${website::basedir}/${shortname}" - } else { - $siteroot = $docroot - } - - apache::vhost { $name: - port => '80', - docroot => $siteroot, - docroot_owner => $docroot_owner, - docroot_group => $docroot_group, - docroot_mode => '2775', - custom_fragment => $custom_fragment, - logroot => '/var/log/apache/', - access_log_file => "access_${logpart}.log", - access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i", - serveraliases => $serveraliases, - ensure => $ensure, - } - - if ($website::proxy_6to4_ip != undef) { - apache::vhost { "$name-PROXY": - ip => $website::proxy_6to4_ip, - port => '80', - docroot => $siteroot, - docroot_owner => $docroot_owner, - docroot_group => $docroot_group, - docroot_mode => '2775', - custom_fragment => "RemoteIPProxyProtocol On -$proxy_fragment", - logroot => '/var/log/apache/', - access_log_file => "access_${logpart}.log", - access_log_format => "%a %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i", - serveraliases => $serveraliases, - ensure => $ensure, - } - } -}