Merge pull request #1203 from edx/han/apache

Coding conventions, puting spaces in front of {{ and changing ${ vars

playbooks/roles/apache/tasks/main.yml

@@ -2,7 +2,7 @@
 ---
 
 - name: Installs apache and mod_wsgi from apt
-  apt: pkg={{item}} install_recommends=no state=present update_cache=yes
+  apt: pkg={{ item }} install_recommends=no state=present update_cache=yes
   with_items:
     - apache2
     - libapache2-mod-wsgi

playbooks/roles/apache/templates/lms.j2

 WSGIPythonHome {{ edxapp_venv_dir }}
 WSGIRestrictEmbedded On
 
-<VirtualHost *:{{apache_port}}>
+<VirtualHost *:{{ apache_port }}>
     ServerName https://{{ lms_env_config.SITE_NAME }}
     ServerAlias *.{{ lms_env_config.SITE_NAME }}
     UseCanonicalName On
- 
+
     Alias /static/ /opt/wwc/staticfiles/
-    
+
     <Directory /opt/wwc/staticfiles>
         Order deny,allow
         Allow from all
     </Directory>
 
     SetEnv SERVICE_VARIANT lms
-    
+
     WSGIScriptAlias / {{ edxapp_code_dir }}/lms/wsgi_apache_lms.py
 
     <Directory {{ edxapp_code_dir }}/lms>
@@ -42,10 +42,10 @@ WSGIRestrictEmbedded On
     WSGIDaemonProcess lms user=www-data group=adm processes=1 python-path={{ edxapp_code_dir }}:{{ edxapp_venv_dir }}/lib/python2.7/site-packages display-name=%{GROUP}
     WSGIProcessGroup lms
     WSGIApplicationGroup %{GLOBAL}
-    
+
     ErrorLog ${APACHE_LOG_DIR}/apache-edx-error.log
 
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %D" apache-edx
-    CustomLog ${APACHE_LOG_DIR}/apache-edx-access.log apache-edx
+    CustomLog {{ APACHE_LOG_DIR }}/apache-edx-access.log apache-edx
 
 </VirtualHost>

playbooks/roles/apache/templates/ports.conf.j2

-NameVirtualHost *:{{apache_port}}
-Listen {{apache_port}}
+NameVirtualHost *:{{ apache_port }}
+Listen {{ apache_port }}