diff options
| author | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 20:33:44 +0100 |
|---|---|---|
| committer | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 20:33:44 +0100 |
| commit | 5ba657e0bca0e4970b08583f6dfc94bfae34741c (patch) | |
| tree | 44ed77deecd40ca984aae4bfa1bb949cb87bf7a0 /web/etc | |
| parent | d528cad67897dd2c3b98ec15a82868ac2764e2c7 (diff) | |
| parent | 727e4ab31aa6d1a754711d4cd29dbcefae2e952a (diff) | |
Merge branch 'master' of https://github.com/tech-server/tgmanage
Diffstat (limited to 'web/etc')
| -rw-r--r-- | web/etc/apache2/nms-public.tg15.gathering.org.conf | 21 | ||||
| -rw-r--r-- | web/etc/apache2/nms-public.tg16.gathering.org.conf | 30 | ||||
| -rw-r--r-- | web/etc/apache2/nms.tg16.gathering.org.conf | 2 | ||||
| -rw-r--r-- | web/etc/varnish/nms.vcl | 3 |
4 files changed, 31 insertions, 25 deletions
diff --git a/web/etc/apache2/nms-public.tg15.gathering.org.conf b/web/etc/apache2/nms-public.tg15.gathering.org.conf deleted file mode 100644 index 6ca255d..0000000 --- a/web/etc/apache2/nms-public.tg15.gathering.org.conf +++ /dev/null @@ -1,21 +0,0 @@ -<VirtualHost *:8080> - ServerAdmin drift@gathering.org - ServerName nms-public.tg15.gathering.org - - DocumentRoot /root/tgmanage/web/nms-public.gathering.org - AddHandler cgi-script .cgi .sh .pl .py - - LogLevel warn - ErrorLog /var/log/apache2/error-nms-public.tg15.gathering.org.log - CustomLog /var/log/apache2/access-nms-public.tg15.gathering.org.log combined - - <Directory "/root/tgmanage/web/nms-public.gathering.org"> - AllowOverride None - Options Indexes FollowSymLinks ExecCGI MultiViews - - Require all granted - </Directory> - - ServerSignature On - -</VirtualHost> diff --git a/web/etc/apache2/nms-public.tg16.gathering.org.conf b/web/etc/apache2/nms-public.tg16.gathering.org.conf new file mode 100644 index 0000000..7e24b5c --- /dev/null +++ b/web/etc/apache2/nms-public.tg16.gathering.org.conf @@ -0,0 +1,30 @@ +<VirtualHost *:8080> + ServerAdmin drift@gathering.org + ServerName nms-public.tg16.gathering.org + ServerAlias nms-public.tg16.gathering.org + + DocumentRoot /srv/tgmanage/web/nms-public.gathering.org + ScriptAlias /api/public/ /srv/tgmanage/web/nms-public.gathering.org/api/public/ + <Directory "/srv/tgmanage/web/nms-public.gathering.org/api/public/"> + AllowOverride None + Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch + Require all granted + </Directory> + <Directory "/srv/tgmanage/web/nms-public.gathering.org"> + AllowOverride None + Options Indexes FollowSymLinks MultiViews + Require all granted + + AddDefaultCharset UTF-8 + </Directory> + + ErrorLog /var/log/apache2/error-nms-public.tg16.gathering.org.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/access-nms-public.tg16.gathering.org.log combined + ServerSignature On + +</VirtualHost> diff --git a/web/etc/apache2/nms.tg16.gathering.org.conf b/web/etc/apache2/nms.tg16.gathering.org.conf index 9a6d7cd..1c1d7e3 100644 --- a/web/etc/apache2/nms.tg16.gathering.org.conf +++ b/web/etc/apache2/nms.tg16.gathering.org.conf @@ -1,7 +1,7 @@ <VirtualHost *:8080> ServerAdmin drift@gathering.org ServerName nms.tg16.gathering.org - ServerAlias einstein.tg16.gathering.org + ServerAlias nms.tg16.gathering.org DocumentRoot /srv/tgmanage/web/nms.gathering.org ScriptAlias /api/private/ /srv/tgmanage/web/nms.gathering.org/api/private/ diff --git a/web/etc/varnish/nms.vcl b/web/etc/varnish/nms.vcl index 6349238..93da9de 100644 --- a/web/etc/varnish/nms.vcl +++ b/web/etc/varnish/nms.vcl @@ -22,9 +22,6 @@ sub vcl_recv { return (synth(418,"LOLOLOL")); } - # Hardcoded for testing - set req.http.host = "nms.tg16.gathering.org"; - if (req.method != "GET" && req.method != "HEAD") { /* We only deal with GET and HEAD by default */ return (pass); |