diff options
| author | Joachim Tingvold <joachim@tingvold.com> | 2015-03-31 05:09:33 +0200 |
|---|---|---|
| committer | Joachim Tingvold <joachim@tingvold.com> | 2015-03-31 05:09:33 +0200 |
| commit | 381e194162092e6ca6d1da2248a41af8b4f7208d (patch) | |
| tree | 224c1f7003a1ff3f9a5f4d844c1bea3c86f88958 /web/etc | |
| parent | 191df1949e2e05eb20b49d5cb31afc7a1f70da91 (diff) | |
| parent | e3d7c5cc86fedb458d9b091ca12245c01e7f285d (diff) | |
Merge branch 'master' of github.com:tech-server/tgmanage
Diffstat (limited to 'web/etc')
| -rw-r--r-- | web/etc/apache2/nms-public.tg13.gathering.org | 11 | ||||
| -rw-r--r-- | web/etc/apache2/nms-public.tg15.gathering.org | 2 | ||||
| -rw-r--r-- | web/etc/apache2/nms.tg13.gathering.org | 39 | ||||
| -rw-r--r-- | web/etc/apache2/nms.tg15.gathering.org | 11 | ||||
| -rw-r--r-- | web/etc/apache2/stream.tg15.gathering.org | 4 |
5 files changed, 5 insertions, 62 deletions
diff --git a/web/etc/apache2/nms-public.tg13.gathering.org b/web/etc/apache2/nms-public.tg13.gathering.org deleted file mode 100644 index 2c6115a..0000000 --- a/web/etc/apache2/nms-public.tg13.gathering.org +++ /dev/null @@ -1,11 +0,0 @@ -<VirtualHost *:80> - ServerAdmin drift@gathering.org - ServerName nms-public.tg13.gathering.org - - DocumentRoot /srv/www/nms-public.tg13.gathering.org - AddHandler cgi-script .cgi .sh .pl .py - - LogLevel warn - ErrorLog /var/log/apache2/error-nms-public.tg13.gathering.org.log - CustomLog /var/log/apache2/access-nms-public.tg13.gathering.org.log combined -</VirtualHost> diff --git a/web/etc/apache2/nms-public.tg15.gathering.org b/web/etc/apache2/nms-public.tg15.gathering.org index 4ebf79b..4c4798c 100644 --- a/web/etc/apache2/nms-public.tg15.gathering.org +++ b/web/etc/apache2/nms-public.tg15.gathering.org @@ -1,4 +1,4 @@ -<VirtualHost *:80> +<VirtualHost *:8080> ServerAdmin drift@gathering.org ServerName nms-public.tg15.gathering.org diff --git a/web/etc/apache2/nms.tg13.gathering.org b/web/etc/apache2/nms.tg13.gathering.org deleted file mode 100644 index cb81598..0000000 --- a/web/etc/apache2/nms.tg13.gathering.org +++ /dev/null @@ -1,39 +0,0 @@ -<VirtualHost *:80> - ServerAdmin drift@gathering.org - ServerName nms.tg13.gathering.org - ServerAlias flexus.tg13.gathering.org - - DocumentRoot /root/tgmanage/web/nms.gathering.org - <Directory "/root/tgmanage/web/nms.gathering.org"> - AllowOverride None - Options Indexes FollowSymLinks ExecCGI MultiViews - Order allow,deny - Satisfy any - Allow from ::1 - Allow from 127.0.0.1 - Allow from 151.216.125.0/24 - Allow from 151.216.124.0/24 - Allow from 2a02:ed02:124::/64 - Allow from 2a02:ed02:125::/64 - - AddHandler cgi-script .cgi .sh .pl .py - AddDefaultCharset UTF-8 - - AuthUserFile /root/tgmanage/web/.htpasswd - AuthGroupFile /dev/null - AuthName "Tech:Server Secret Volcano Lair" - AuthType Basic - - require valid-user - </Directory> - - ErrorLog /var/log/apache2/error-nms.tg13.gathering.org.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access-nms.tg13.gathering.org.log combined - ServerSignature On - -</VirtualHost> diff --git a/web/etc/apache2/nms.tg15.gathering.org b/web/etc/apache2/nms.tg15.gathering.org index b06257d..e177d44 100644 --- a/web/etc/apache2/nms.tg15.gathering.org +++ b/web/etc/apache2/nms.tg15.gathering.org @@ -1,26 +1,19 @@ -<VirtualHost *:80> +<VirtualHost *:8080> ServerAdmin drift@gathering.org ServerName nms.tg15.gathering.org - ServerAlias noget.tg15.gathering.org + ServerAlias einstein.tg15.gathering.org DocumentRoot /root/tgmanage/web/nms.gathering.org <Directory "/root/tgmanage/web/nms.gathering.org"> AllowOverride None Options Indexes FollowSymLinks ExecCGI MultiViews - Order allow,deny - Satisfy any - Allow from ::1 - Allow from 127.0.0.1 - Allow from 192.168.122.0/24 AddHandler cgi-script .cgi .sh .pl .py AddDefaultCharset UTF-8 AuthUserFile /root/tgmanage/web/.htpasswd - AuthGroupFile /dev/null AuthName "Tech:Server Secret Volcano Lair" AuthType Basic - require valid-user </Directory> diff --git a/web/etc/apache2/stream.tg15.gathering.org b/web/etc/apache2/stream.tg15.gathering.org index a7c0dda..52d879c 100644 --- a/web/etc/apache2/stream.tg15.gathering.org +++ b/web/etc/apache2/stream.tg15.gathering.org @@ -1,4 +1,4 @@ - <VirtualHost *:80> + <VirtualHost *:8080> ServerAdmin drift@gathering.org ServerName stream.tg15.gathering.org ServerAlias krosus.tg15.gathering.org @@ -9,9 +9,9 @@ Options Indexes FollowSymLinks ExecCGI MultiViews Order allow,deny Allow from all + Require all granted AddHandler cgi-script .cgi .sh .pl .py AddDefaultCharset UTF-8 - </Directory> ErrorLog /var/log/apache2/error-stream.tg15.gathering.org.log |