From: Aurelien Jarno Date: Sun, 4 Jun 2017 14:29:52 +0000 (+0200) Subject: Remove httpredir related code X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f3bb06c1122c41aea91d72fd7f9ed6ecdb66541d;p=mirror%2Fdsa-puppet.git Remove httpredir related code Signed-off-by: Aurelien Jarno --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index fd34e41c2..e5e4dae25 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -47,8 +47,6 @@ roles: - adayevskaya.debian.org historicalpackages: - hier.debian.org - httpredir: - - dummy jenkins: - jerea.debian.org keyring: diff --git a/modules/roles/files/httpredir/httpredir.debian.org.conf b/modules/roles/files/httpredir/httpredir.debian.org.conf deleted file mode 100644 index 47fb93b4f..000000000 --- a/modules/roles/files/httpredir/httpredir.debian.org.conf +++ /dev/null @@ -1,90 +0,0 @@ -# -#BalancerMember unix:/srv/httpredir.debian.org/sockets/starman|http://127.0.0.2/ -##BalancerMember http://127.0.0.1:5000/ -##BalancerMember http://127.0.0.1:5001/ -##BalancerMember http://127.0.0.1:5002/ -##BalancerMember http://127.0.0.1:5003/ -##BalancerMember http://127.0.0.1:5004/ -##BalancerMember http://127.0.0.1:5005/ -##BalancerMember http://127.0.0.1:5006/ -##BalancerMember http://127.0.0.1:5007/ -##BalancerMember http://127.0.0.1:5008/ -##BalancerMember http://127.0.0.1:5009/ -##BalancerMember http://127.0.0.1:5010/ -# - - - ServerName httpredir.debian.org - ServerAdmin mirrors@debian.org - ServerAlias http.debian.net - ServerAlias http-master.debian.net - ServerAlias amd64-geomirror.debian.net - ServerAlias i386-geomirror.debian.net - ServerAlias sparc-geomirror.debian.net - ServerAlias powerpc-geomirror.debian.net - ServerAlias hurd-i386-geomirror.debian.net - ServerAlias arm-geomirror.debian.net - ServerAlias m68k-geomirror.debian.net - ServerAlias s390-geomirror.debian.net - ServerAlias alpha-geomirror.debian.net - ServerAlias hppa-geomirror.debian.net - ServerAlias ia64-geomirror.debian.net - ServerAlias mips-geomirror.debian.net - ServerAlias mipsel-geomirror.debian.net - ServerAlias http.non-free.org - ServerAlias ftp.non-free.org - ServerAlias mirror.debian.net - ServerAlias *.mirror.debian.net - ServerAlias cdn.debian.net - - ErrorLog /var/log/apache2/httpredir.debian.org-error.log - #LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" \"%{Host}i\"" combined_host - CustomLog ${APACHE_LOG_DIR}/httpredir.debian.org-access.log privacy - - #LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Location}o\" \"%{Referer}i\" \"%{User-Agent}i\"" combined_redirects - #CustomLog ${APACHE_LOG_DIR}/httpredir.debian.org-access.log combined_redirects - - DocumentRoot /srv/httpredir.debian.org/www - - - Options FollowSymLinks - AllowOverride None - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Require all granted - - - Require all granted - - - Require all denied - - - -# -# Order allow,deny -# allow from all -# - - RewriteEngine on - - RewriteCond %{HTTP_HOST} \.non-?free\.org - RewriteRule ^/?debian/(?:dists/[^/]{1,40}|pool)/main/? http://www.non-free.org/ [R=404,L] - RewriteCond %{HTTP_HOST} \.non-?free\.org - RewriteRule ^/?(?:index\.html)?$ http://www.non-free.org/ [R=301,L] - - #ProxyPass /redir-bay9NBKG balancer://httredir-cluster - ProxyPass /redir-bay9NBKG unix:/srv/httpredir.debian.org/sockets/starman|http://127.0.0.2/ - #ProxyPass /redir-bay9NBKG http://127.0.0.1:5000/ - - RewriteRule ^/?(?:(demo)/)?debian-(security|backports)/(.*) /redir-bay9NBKG/?mirror=$2&url=$3&action=$1 [PT] - RewriteRule ^/?(?:(demo)/)?debian-archive/(.*) /redir-bay9NBKG/?mirror=old&url=$2&action=$1 [PT] - RewriteRule ^/?(?:(demo)/)?debian/(.*) /redir-bay9NBKG/?mirror=archive&url=$2&action=$1 [PT] - - # mirror:// method support: - RewriteRule ^/?debian-(security|backports)\.list(?:$|\?(.+)) /redir-bay9NBKG/?mirror=$1.list$2 [QSA,PT] - RewriteRule ^/?debian-archive\.list(?:$|\?(.+)) /redir-bay9NBKG/?mirror=old.list$1 [QSA,PT] - RewriteRule ^/?debian\.list(?:$|\?(.+)) /redir-bay9NBKG/?mirror=archive.list$1 [QSA,PT] - diff --git a/modules/roles/manifests/httpredir.pp b/modules/roles/manifests/httpredir.pp deleted file mode 100644 index d7a482fae..000000000 --- a/modules/roles/manifests/httpredir.pp +++ /dev/null @@ -1,8 +0,0 @@ -class roles::httpredir { - if $::apache2 { - apache2::site { '010-httpredir.debian.org': - site => 'httpredir.debian.org', - source => 'puppet:///modules/roles/httpredir/httpredir.debian.org.conf', - } - } -} diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index e8e980140..124c1888e 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -285,10 +285,6 @@ class roles { ssl::service { 'sreview.debian.net': notify => Exec['service apache2 reload'], key => true, } } - if has_role('httpredir') { - include roles::httpredir - } - if has_role('debtags') { include roles::debtags } diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index df5cea9fe..589a4900b 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -119,8 +119,6 @@ nagios storace=(debbackup) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg %gitdoadm ALL=(gitdoadm) ALL # the git user also exists on adayevskaya where it's a different service.. %gitdoadm gigault=(git) ALL -%httpredir ALL=(httpredir) ALL -%httpredir ALL=(httpredir-app) ALL %keyring ALL=(keyring) ALL %jenkins-adm ALL=(jenkins-adm) ALL %lintian ALL=(lintian) ALL @@ -165,9 +163,6 @@ dak ALL=(dak-unpriv) NOPASSWD: ALL # and ftpmaster can access the role user for their web services %debadmin FTPHOSTS=(dak-web) ALL -# the httpredir role use can run things as httpredir-app -httpredir ALL=(httpredir-app) NOPASSWD: ALL - # some groups are in apachectrl on "their" hosts so they can reload apache and update their vhost %apachectrl ALL=(root) /usr/sbin/apache2-vhost-update