Commit 9c1b5372 by John Jarvis

STATIC_ROOT->STATIC_ROOT_BASE

parent 9323a427
...@@ -217,7 +217,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth ...@@ -217,7 +217,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth
CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
generic_env_config: &edxapp_generic_env generic_env_config: &edxapp_generic_env
STATIC_ROOT: $edxapp_staticfile_dir STATIC_ROOT_BASE: $edxapp_staticfile_dir
LMS_BASE: $EDXAPP_LMS_BASE LMS_BASE: $EDXAPP_LMS_BASE
CMS_BASE: $EDXAPP_CMS_BASE CMS_BASE: $EDXAPP_CMS_BASE
BOOK_URL: $EDXAPP_BOOK_URL BOOK_URL: $EDXAPP_BOOK_URL
......
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
when: mongo_clustered is defined when: mongo_clustered is defined
- name: mongo | Initialize the replication set - name: mongo | Initialize the replication set
shell: /usr/bin/mongo /tmp/repset_init.js shell: /usr/bin/mongo /tmp/repset_init.js
when: mongo_clusterd is defined
# Ignoring errors here because slave instances will fail this command # Ignoring errors here because slave instances will fail this command
# since slaveOk is false in ansible 1.3. # since slaveOk is false in ansible 1.3.
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
- name: nginx | Server configuration file - name: nginx | Server configuration file
template: > template: >
src=nginx.conf.j2 dest=/etc/nginx/nginx.conf src=nginx.conf.j2 dest=/etc/nginx/nginx.conf
owner=root group=root mode=0644 owner=root group={{ common_web_user }} mode=0644
notify: nginx | reload nginx notify: nginx | reload nginx
- name: nginx | Creating common nginx configuration - name: nginx | Creating common nginx configuration
......
...@@ -57,7 +57,7 @@ http { ...@@ -57,7 +57,7 @@ http {
# Virtual Host Configs # Virtual Host Configs
## ##
include {{ nginx_sites_enabled_dir }}/*.conf; include {{ nginx_sites_enabled_dir }}/*;
include {{ nginx_conf_dir }}/*; include {{ nginx_conf_dir }}/*.conf;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment