瀏覽代碼

Fix paths in QA config files

master
David Winterbottom 13 年之前
父節點
當前提交
2a12c1af37
共有 3 個文件被更改,包括 7 次插入6 次删除
  1. 3
    2
      sites/sandbox/deploy/apache2/qa.conf
  2. 3
    3
      sites/sandbox/deploy/nginx/qa.conf
  3. 1
    1
      sites/sandbox/deploy/wsgi/qa.wsgi

+ 3
- 2
sites/sandbox/deploy/apache2/qa.conf 查看文件

@@ -1,5 +1,6 @@
1 1
 <VirtualHost *>
2 2
     ServerName qa.oscar.tangentlabs.co.uk
3
+    ServerAlias qa.oscarcommerce.com
3 4
     DocumentRoot /var/www/nginx-default
4 5
     CustomLog /var/log/apache2/access.qa.oscar.log combined
5 6
     ErrorLog /var/log/apache2/error.qa.oscar.log
@@ -8,10 +9,10 @@
8 9
     WSGIDaemonProcess oscar-qa processes=2 threads=5 display-name=oscar maximum-requests=10000
9 10
     WSGIProcessGroup oscar-qa
10 11
     WSGIApplicationGroup %{GLOBAL}
11
-    WSGIScriptAlias / /var/www/oscar/builds/qa/sandbox/deploy/wsgi/qa.wsgi
12
+    WSGIScriptAlias / /var/www/oscar/builds/qa/sites/sandbox/deploy/wsgi/qa.wsgi
12 13
     WSGIPassAuthorization On
13 14
 
14
-    <Directory /var/www/oscar/builds/qa/sandbox/deploy/wsgi>
15
+    <Directory /var/www/oscar/builds/qa/sites/sandbox/deploy/wsgi>
15 16
         Order deny,allow
16 17
         Allow from all
17 18
     </Directory>

+ 3
- 3
sites/sandbox/deploy/nginx/qa.conf 查看文件

@@ -12,13 +12,13 @@ server {
12 12
 	client_max_body_size 3M;
13 13
 
14 14
 	location /media/ {
15
-		root /var/www/oscar/builds/qa/sandbox/assets;
15
+		root /var/www/oscar/builds/qa/sites/sandbox/assets;
16 16
 	}
17 17
     location =/robots.txt {
18
-		root /var/www/oscar/builds/sandbox/sandbox/public;
18
+		root /var/www/oscar/builds/qa/sites/sandbox/public;
19 19
 	}
20 20
 	location /static/ {
21
-		root /var/www/oscar/builds/qa/sandbox/public;
21
+		root /var/www/oscar/builds/qa/sites/sandbox/public;
22 22
 	}
23 23
 
24 24
     proxy_pass_request_headers on;

+ 1
- 1
sites/sandbox/deploy/wsgi/qa.wsgi 查看文件

@@ -6,7 +6,7 @@ import urllib
6 6
 sys.stdout = sys.stderr
7 7
 
8 8
 # Project root
9
-root = '/var/www/oscar/builds/qa/sandbox'
9
+root = '/var/www/oscar/builds/qa/sites/sandbox'
10 10
 sys.path.insert(0, root)
11 11
 
12 12
 # Packages from virtualenv

Loading…
取消
儲存