Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Missed some site subsitutions.

  • Loading branch information...
commit 1b820116820308db0dc77ae029369e2b8036616b 1 parent e5f60d5
Derrick Petzold authored
Showing with 4 additions and 5 deletions.
  1. +3 −3 django/nginx.conf
  2. +1 −2  generate_site.py
6 django/nginx.conf
View
@@ -4,13 +4,13 @@ upstream {{ site_name }}proxy {
server {
listen 80;
- server_name www.{{ site_name }}.{% if local %}site{% else %}{{ site_domain }}{% endif %};
- rewrite ^/(.*) http://{{ site_name }}.{% if local %}site{% else %}{{ site_domain }}{% endif %}/$1 permanent;
+ server_name www.{{ site_name }}.{% if local %}{{ local_suffix }}{% else %}{{ site_domain }}{% endif %};
+ rewrite ^/(.*) http://{{ site_name }}.{% if local %}{{ local_suffix }}{% else %}{{ site_domain }}{% endif %}/$1 permanent;
}
server {
listen 80;
- server_name {{ site_name }}.{% if local %}site{% else %}{{ site_domain }}{% endif %};
+ server_name {{ site_name }}.{% if local %}{{ local_suffix }}{% else %}{{ site_domain }}{% endif %};
access_log {{ logs }}nginx_access.log;
error_log {{ logs }}nginx_error.log;
location / {
3  generate_site.py
View
@@ -8,7 +8,7 @@
from django.conf import settings
from django.template import Context
-from django.template.loader import get_template, get_template_from_string
+from django.template.loader import get_template
DEFAULT_TYPE = 'django'
@@ -97,7 +97,6 @@ def render_dict(_dict, context):
# create a django context to use for rendering project templates
context = Context(config)
-
context.update({'database': render_dict(database_mapping, context)})
# create a new virtualenv for the project
Please sign in to comment.
Something went wrong with that request. Please try again.