diff options
| author | Kristian Lyngstol <kristian@bohemians.org> | 2016-04-13 20:32:49 +0200 | 
|---|---|---|
| committer | Kristian Lyngstol <kristian@bohemians.org> | 2016-04-13 20:32:49 +0200 | 
| commit | c5f312dab7a7726beae137fb328c6ef1a5affc9b (patch) | |
| tree | c3a80a62b806f2845a930b8c6c6e6c3c35ac8fc4 /extras | |
| parent | 9b4ec9ac312249a3662b887eca038fe220bb7155 (diff) | |
Build/test: Work on front
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/misc/apache2.conf | 43 | 
1 files changed, 19 insertions, 24 deletions
| diff --git a/extras/misc/apache2.conf b/extras/misc/apache2.conf index 08471e0..572e232 100644 --- a/extras/misc/apache2.conf +++ b/extras/misc/apache2.conf @@ -1,56 +1,51 @@ -<VirtualHost *:8080> -        ServerAdmin drift@gathering.org -        ServerName nms.tg16.gathering.org -        ServerAlias nms.tg16.gathering.org +<VirtualHost *:80> +        ServerAdmin lol@example.com +        ServerName nms.example.com +        ServerAlias nms.example.com -        DocumentRoot /srv/tgmanage/web/nms.gathering.org -	ScriptAlias /api/write/ /srv/tgmanage/web/nms.gathering.org/api/write/ -	ScriptAlias /api/read/ /srv/tgmanage/web/nms.gathering.org/api/read/ -	ScriptAlias /api/public/ /srv/tgmanage/web/nms.gathering.org/api/public/ -	<Directory "/srv/tgmanage/web/nms.gathering.org/api/write/"> +        DocumentRoot /opt/tgnms/web +	ScriptAlias /api/write/ /opt/tgnms/web/api/write/ +	ScriptAlias /api/read/ /opt/tgnms/web/api/read/ +	ScriptAlias /api/public/ /opt/tgnms/web/api/public/ +	<Directory "/opt/tgnms/web/api/write/">  		AllowOverride None  		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch  		<RequireAny> -			AuthUserFile /srv/tgmanage/web/htpasswd-write -	                AuthName "Tech:Server Secret Volcano Lair" +			AuthUserFile /opt/tgnms/etc/htpasswd-write +	                AuthName "Demo/test of tgnms write"          	        AuthType Basic  			Require valid-user  		</RequireAny>  	</Directory> -	<Directory "/srv/tgmanage/web/nms.gathering.org/api/read/"> +	<Directory "/opt/tgnms/web/api/read/">  		AllowOverride None  		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch  		<RequireAny> -			AuthUserFile /srv/tgmanage/web/htpasswd-read -	                AuthName "The Gathering Network Management System" +			AuthUserFile /opt/tgnms/etc/htpasswd-read +	                AuthName "Demo/test of tgnms read"          	        AuthType Basic  			Require valid-user  		</RequireAny>  	</Directory> -	<Directory "/srv/tgmanage/web/nms.gathering.org/api/public/"> +	<Directory "/opt/tgnms/web/api/public/">  		AllowOverride None  		Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch  		Require all granted  	</Directory> -        <Directory "/srv/tgmanage/web/nms.gathering.org"> +        <Directory "/opt/tgnms/web">                  AllowOverride None                  Options Indexes FollowSymLinks MultiViews                  AddDefaultCharset UTF-8 -		<RequireAny> -			AuthUserFile /srv/tgmanage/web/htpasswd-read -	                AuthName "The Gathering Network Management System" -        	        AuthType Basic -			Require valid-user -		</RequireAny> +		Require all granted          </Directory> -        ErrorLog /var/log/apache2/error-nms.tg16.gathering.org.log +        ErrorLog /var/log/apache2/error-nms.example.com.log          # Possible values include: debug, info, notice, warn, error, crit,          # alert, emerg.          LogLevel warn -        CustomLog /var/log/apache2/access-nms.tg16.gathering.org.log combined +        CustomLog /var/log/apache2/access-nms.example.com.log combined          ServerSignature On  </VirtualHost> | 
