Permalink
Browse files

Adjusted domain structure to fit new convention

  • Loading branch information...
1 parent de2a073 commit 17c3f5df72646b06af20f9a2a873ecff807f8976 @codeinthehole codeinthehole committed Jul 25, 2012
View
@@ -1,5 +1,5 @@
"""
-Project-specific environment information.
+Project-specific environment information.
This module provides configuration for the fabfile to run with. The idea is
that the fabfile is project-agnostic and all configuration takes place within
@@ -35,11 +35,11 @@ def _configure(build_name):
def test():
_configure('test')
- env.hosts = ['test.%(project_code)s.%(client)s.%(domain)s'] % env
+ env.hosts = ['test-%(project_code)s-%(client)s.%(domain)s'] % env
def stage():
_configure('stage')
- env.hosts = ['stage.%(project_code)s.%(client)s.%(domain)s'] % env
+ env.hosts = ['stage-%(project_code)s-%(client)s.%(domain)s'] % env
def prod():
_configure('prod')
@@ -1,6 +1,6 @@
<VirtualHost *>
ServerAdmin sys@{{ domain }}
- ServerName prod.{{ project_code }}.{{ client }}.{{ domain }}
+ ServerName prod-{{ project_code }}-{{ client }}.{{ domain }}
DocumentRoot /var/www/nginx-default
WSGIDaemonProcess {{ client }}-{{ project_code }}-prod processes=9 threads=10 display-name={{ client }}-{{ project_code }}-prod maximum-requests=10000
@@ -18,7 +18,7 @@
# - %T is time to serve the request in SECONDS
# - %D is time to serve the request in MICROSECONDS
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T/%D" timed
- CustomLog /var/log/apache2/access.prod.{{ project_code }}.{{ client }}.{{ domain }}.log timed
- ErrorLog /var/log/apache2/error.prod.{{ project_code }}.{{ client }}.{{ domain }}.log
+ CustomLog /var/log/apache2/access.prod-{{ project_code }}-{{ client }}.{{ domain }}.log timed
+ ErrorLog /var/log/apache2/error.prod-{{ project_code }}-{{ client }}.{{ domain }}.log
</Virtualhost>
@@ -1,6 +1,6 @@
<VirtualHost *>
ServerAdmin sys@{{ domain }}
- ServerName stage.{{ project_code }}.{{ client }}.{{ domain }}
+ ServerName stage-{{ project_code }}-{{ client }}.{{ domain }}
DocumentRoot /var/www/nginx-default
WSGIDaemonProcess {{ client }}-{{ project_code }}-stage processes=2 threads=5 display-name={{ client }}-{{ project_code }}-stage maximum-requests=10000
@@ -18,8 +18,8 @@
# - %T is time to serve the request in SECONDS
# - %D is time to serve the request in MICROSECONDS
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T/%D" timed
- CustomLog /var/log/apache2/access.stage.{{ project_code }}.{{ client }}.{{ domain }}.log timed
- ErrorLog /var/log/apache2/error.stage.{{ project_code }}.{{ client }}.{{ domain }}.log
+ CustomLog /var/log/apache2/access.stage-{{ project_code }}-{{ client }}.{{ domain }}.log timed
+ ErrorLog /var/log/apache2/error.stage-{{ project_code }}-{{ client }}.{{ domain }}.log
# This will need removing when we go live.
<Location />
@@ -1,6 +1,6 @@
<VirtualHost *>
ServerAdmin sys@{{ domain }}
- ServerName test.{{ project_code }}.{{ client }}.{{ domain }}
+ ServerName test-{{ project_code }}-{{ client }}.{{ domain }}
DocumentRoot /var/www/nginx-default
WSGIDaemonProcess {{ client }}-{{ project_code }}-test processes=2 threads=5 display-name={{ client }}-{{ project_code }}-test maximum-requests=10000
@@ -18,8 +18,8 @@
# - %T is time to serve the request in SECONDS
# - %D is time to serve the request in MICROSECONDS
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T/%D" timed
- CustomLog /var/log/apache2/access.test.{{ project_code }}.{{ client }}.{{ domain }}.log timed
- ErrorLog /var/log/apache2/error.test.{{ project_code }}.{{ client }}.{{ domain }}.log
+ CustomLog /var/log/apache2/access.test-{{ project_code }}-{{ client }}.{{ domain }}.log timed
+ ErrorLog /var/log/apache2/error.test-{{ project_code }}-{{ client }}.{{ domain }}.log
# This will need removing when we go live.
<Location />
@@ -1,7 +1,7 @@
server {
listen 80;
- server_name prod.{{ project_code }}.{{ client }}.{{ domain }};
- access_log /var/log/nginx/access.prod.{{ project_code }}.{{ client }}.{{ domain }};
+ server_name prod-{{ project_code }}-{{ client }}.{{ domain }};
+ access_log /var/log/nginx/access.prod-{{ project_code }}-{{ client }}.{{ domain }};
gzip on;
gzip_proxied any;
@@ -1,7 +1,7 @@
server {
listen 80;
- server_name stage.{{ project_code }}.{{ client }}.{{ domain }};
- access_log /var/log/nginx/access.stage.{{ project_code }}.{{ client }}.{{ domain }};
+ server_name stage-{{ project_code }}-{{ client }}.{{ domain }};
+ access_log /var/log/nginx/access.stage-{{ project_code }}-{{ client }}.{{ domain }};
gzip on;
gzip_proxied any;
@@ -1,7 +1,7 @@
server {
listen 80;
- server_name test.{{ project_code }}.{{ client }}.{{ domain }};
- access_log /var/log/nginx/access.test.{{ project_code }}.{{ client }}.{{ domain }};
+ server_name test-{{ project_code }}-{{ client }}.{{ domain }};
+ access_log /var/log/nginx/access.test-{{ project_code }}-{{ client }}-{{ domain }};
gzip on;
gzip_proxied any;

0 comments on commit 17c3f5d

Please sign in to comment.