theforeman · evgeni · Jun 2, 2024 · Jun 6, 2024 · Jun 6, 2024 · evgeni
diff --git a/puppet/Puppetfile b/puppet/Puppetfile
@@ -1,6 +1,5 @@
 moduledir 'external_modules'
 
-mod 'citrin/htpasswd', '1.0.2'
 mod 'claranet/timezone', '2.0.1'
 mod 'puppet/archive', '7.1.0'
 mod 'puppet/augeasproviders_core', '4.1.0'

diff --git a/puppet/modules/awstats/manifests/init.pp b/puppet/modules/awstats/manifests/init.pp
diff --git a/puppet/modules/awstats/manifests/vhost.pp b/puppet/modules/awstats/manifests/vhost.pp
diff --git a/puppet/modules/profiles/manifests/web.pp b/puppet/modules/profiles/manifests/web.pp
@@ -3,20 +3,14 @@
 # @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
-
   class { 'web':
     https => $https,
   }
@@ -26,11 +20,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/htpasswd.pp b/puppet/modules/web/manifests/htpasswd.pp
diff --git 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
diff --git a/puppet/modules/web/templates/debugs.conf.erb b/puppet/modules/web/templates/debugs.conf.erb
diff --git a/puppet/spec/defines/web_htpasswd_spec.rb b/puppet/spec/defines/web_htpasswd_spec.rb