summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/httpd/sites/10.1.8.63.conf5
-rw-r--r--etc/httpd/sites/mirror.conf65
-rw-r--r--etc/httpd/sites/mntscripts.conf24
-rw-r--r--etc/httpd/sites/zz_proxy.conf41
-rw-r--r--etc/mirror/mirror.conf2
5 files changed, 1 insertions, 136 deletions
diff --git a/etc/httpd/sites/10.1.8.63.conf b/etc/httpd/sites/10.1.8.63.conf
deleted file mode 100644
index 7afda1b..0000000
--- a/etc/httpd/sites/10.1.8.63.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# File: /etc/httpd/sites/{ipaddress}.conf
-# Package: mirror
-# Purpose: A template for the mirror apache listeners. This is probably redundant, but in case it's needed, fix the IP address here and in the filename.
-Listen 10.1.8.63:80
-Listen 10.1.8.63:443
diff --git a/etc/httpd/sites/mirror.conf b/etc/httpd/sites/mirror.conf
deleted file mode 100644
index 5f2e761..0000000
--- a/etc/httpd/sites/mirror.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# File: /etc/httpd/sites/mirror.conf
-# Package: mirror
-# Title: Apache mirror config
-# Purpose: To provide a standard mirror http and https site
-# Reference:
-# Instructions:
-# you can make a simple IP listener conf with the following
-# thisip=$( ifconfig 2>/dev/null | awk '/Bcast|broadcast/{print $2}' | tr -cd '[^0-9\.\n]' | head -n1)
-# printf "Listen %s\nListen %s" "${thisip}:80" "${thisip}:443" > /etc/httpd/sites/${thisip}.conf
-# Be sure to fix the IP addresses here for the virtual hosts.
-# Also ensure /etc/hosts has the right hostnames configured for the ssl vhost below
-# Document: Below this line
-
-<VirtualHost 10.1.8.63:80>
-
- ServerName mirror.example.com:80
- ServerAlias mirror brass mirror-brass mirrorbrass brassmirror *.mirror.example.com brass.example.com
- # this server also provides bgscripts.repo at http://mirror.example.com/bgscripts which is /var/www/html/mirror.example.com/bgscripts
-
- DocumentRoot "/var/www/html/mirror.example.com"
-
- Alias /mirror /mnt/mirror
-
- # Index options
- Options +Indexes
- IndexOptions IgnoreCase FancyIndexing FoldersFirst NameWidth=* DescriptionWidth=* SuppressHTMLPreamble
- IndexIgnore FOOTER.html repodata tivoli *.so bgscripts
- ReadmeName FOOTER.html
-
- # Useful additions for the mirror
- AddIcon /icons/rpm.png .rpm
- AddIcon /icons/repo.png .repo
- AddType application/octet-stream .iso
-
- <Directory "/var/www/html/mirror.example.com">
- AllowOverride None
- Order allow,deny
- Allow from all
- Options Indexes FollowSymLinks
- </Directory>
-
- # Allows "centos.mirror.example.com" redirection to "mirror.example.com/centos" behavior
- RewriteEngine On
- RewriteCond %{HTTP_HOST} ^([^.]*)\.mirror\.example\.com$
- RewriteRule /(.*) http://mirror.example.com/%1/$1 [R,L]
-
-</VirtualHost>
-
-<VirtualHost 10.1.8.63:443>
- SSLEngine on
- SSLProtocol all -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
- SSLCertificateFile /etc/pki/tls/certs/wildcard.crt
- SSLCertificateKeyFile /etc/pki/tls/private/wildcard.key
- SSLCACertificateFile /etc/pki/tls/certs/rapidssl.crt
-
- LogLevel warn
- # Reverse proxy all ssl traffic to the nonencrypted site. This is a template for any and all sites.
- # Observe that this depends on /etc/hosts or DNS to look up the variable SERVER_NAME
- SSLProxyEngine On
- RewriteEngine On
- RewriteRule ^/(.*)$ http://%{SERVER_NAME}/$1 [P,L]
-
-</VirtualHost>
diff --git a/etc/httpd/sites/mntscripts.conf b/etc/httpd/sites/mntscripts.conf
deleted file mode 100644
index 31cdc6b..0000000
--- a/etc/httpd/sites/mntscripts.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<VirtualHost 10.1.8.63:80>
-
- ServerName mntscripts.example.com:80
- ServerAlias mntscripts scripts scripts.example.com
-
- DocumentRoot "/var/www/html/mntscripts.example.com"
-
- AddType application/octet-stream .iso
-
- #Alias /mirror /mnt/mirror
-
- Options +Indexes
- IndexOptions FancyIndexing NameWidth=* DescriptionWidth=*
- IndexIgnore FOOTER.html repodata
- ReadmeName FOOTER.html
-
- <Directory "/var/www/html/mntscripts.example.com">
- AllowOverride None
- Order allow,deny
- Allow from all
- Options Indexes FollowSymLinks
- </Directory>
-
-</VirtualHost>
diff --git a/etc/httpd/sites/zz_proxy.conf b/etc/httpd/sites/zz_proxy.conf
deleted file mode 100644
index c6221de..0000000
--- a/etc/httpd/sites/zz_proxy.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# File: /etc/httpd/sites/zz_proxy.conf
-<Proxy *>
- Order deny,allow
- Deny from all
- # Allow each host or range as desired.
-
- Allow from 203.0.193.232/255.255.255.255
- Allow from 10.1.9.194/32
- # Whole Linux dev subnet
- Allow from 10.1.9.0/24
- # Whole IT-192 network in vmware so I do not have to keep doing this
- Allow from 203.0.192.0/23
- # onyx for webtatic
- Allow from 10.1.9.121/32
- # company-owned wireless devices subnets
- Allow from 10.48.0.0/16
- # personally-owned wireless devices
- Allow from 10.21.0.0/16
-
-</Proxy>
-
-Listen 10.1.8.63:8090
-<VirtualHost 10.1.8.63:8080>
-
- ServerName junk.example.com:8080
- ServerAlias *
-
- DocumentRoot /var/www/html/notfound
-
- RewriteEngine On
- ProxyRequests On
- RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI}
- ProxyPass / http://%{HTTP_HOST}%{REQUEST_URI}
-
- # if this apache server is behind a proxy:
- #ProxyRemote * http://proxy.example.com:8080/
-
- CustomLog "logs/proxy_log" combinedvhost env=!dontlog
- ErrorLog "logs/proxy_error_log"
-
-</VirtualHost>
diff --git a/etc/mirror/mirror.conf b/etc/mirror/mirror.conf
index 69f38c7..03f9b8e 100644
--- a/etc/mirror/mirror.conf
+++ b/etc/mirror/mirror.conf
@@ -8,6 +8,6 @@ lockfile /var/lock/mirror.lock
logdir /var/log/mirror
logfile ${logdir}/mirror.${today}.log
errorfile ${logdir}/mirror.${today}.err
-scriptsdir /etc/mirror/scripts
+scriptsdir /usr/share/mirror/scripts
keeplogs 14
#mirrordir is actually manually configured for each executable script. See $mirrorscriptsdir
bgstack15