diff --git a/puppet/modules/awstats/manifests/init.pp b/puppet/modules/awstats/manifests/init.pp index 5c0bcdc08..d8db81690 100644 --- a/puppet/modules/awstats/manifests/init.pp +++ b/puppet/modules/awstats/manifests/init.pp @@ -3,7 +3,6 @@ $vhosts = [ 'all', 'deb', - 'debugs', 'downloads', 'stagingdeb', 'web', diff --git a/puppet/modules/profiles/manifests/web.pp b/puppet/modules/profiles/manifests/web.pp index 190e7d4bb..e9f786870 100644 --- a/puppet/modules/profiles/manifests/web.pp +++ b/puppet/modules/profiles/manifests/web.pp @@ -3,16 +3,12 @@ # @param stable # Latest release that users expect # -# @param debugs_htpasswds -# Which htpasswds to create for the debug vhost -# # @param https # Whether to enable HTTPS. This is typically wanted but can only be enabled # in a 2 pass setup. First Apache needs to run for Letsencrypt to function. # Then Letsencrypt can be enabled. Also useful to turn off in test setups. class profiles::web ( String[1] $stable = '3.10', - Hash[String, Hash] $debugs_htpasswds = {}, Boolean $https = true, ) { contain awstats @@ -26,11 +22,6 @@ contain web::vhost::deb - class { 'web::vhost::debugs': - htpasswds => $debugs_htpasswds, - } - contain web::vhost::debugs - contain web::vhost::downloads contain web::vhost::stagingdeb diff --git a/puppet/modules/web/manifests/init.pp b/puppet/modules/web/manifests/init.pp index 1ca76708b..9d22f1ccc 100644 --- a/puppet/modules/web/manifests/init.pp +++ b/puppet/modules/web/manifests/init.pp @@ -25,7 +25,6 @@ 'theforeman.org', 'archivedeb.theforeman.org', 'deb.theforeman.org', - 'debugs.theforeman.org', 'downloads.theforeman.org', 'stagingdeb.theforeman.org', 'www.theforeman.org', @@ -36,7 +35,6 @@ '/var/www/vhosts/web/htdocs', '/var/www/vhosts/archivedeb/htdocs', '/var/www/vhosts/deb/htdocs', - '/var/www/vhosts/debugs/htdocs', '/var/www/vhosts/downloads/htdocs', '/var/www/vhosts/stagingdeb/htdocs', '/var/www/vhosts/web/htdocs', diff --git a/puppet/modules/web/manifests/vhost/debugs.pp b/puppet/modules/web/manifests/vhost/debugs.pp deleted file mode 100644 index 57b8a5549..000000000 --- a/puppet/modules/web/manifests/vhost/debugs.pp +++ /dev/null @@ -1,20 +0,0 @@ -# @summary Set up the debugs vhost -# @api private -class web::vhost::debugs( - Hash[String, Hash] $htpasswds = {}, -) { - web::vhost { 'debugs': - docroot_owner => 'nobody', - docroot_group => 'nobody', - docroot_mode => '0755', - attrs => { - 'custom_fragment' => template('web/debugs.conf.erb'), - }, - } - - $htpasswds.each |$username, $options| { - web::htpasswd { $username: - * => $options, - } - } -} diff --git a/puppet/modules/web/templates/debugs.conf.erb b/puppet/modules/web/templates/debugs.conf.erb deleted file mode 100644 index 0070c70ef..000000000 --- a/puppet/modules/web/templates/debugs.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ - - AuthType Basic - AuthName "Foreman-debug uploads - restricted area" - AuthUserFile /var/www/vhosts/debugs/htpasswd - Require valid-user - - -# For ACME/Let's Encrypt challenges - - Satisfy Any - Order Allow,Deny - Allow from all - - -# For AWStats icons -Alias "/awstats/icon/" "/usr/share/awstats/wwwroot/icon/"