Merge pull request #2644 from edx/e0d/fix-nginx

E0d/fix nginx

docker/build/nginx/xDockerfile → docker/build/nginx/Dockerfile

 FROM edxops/precise-common:latest
 MAINTAINER edxops
 
-USER docker
-WORKDIR /edx/app/edx_ansible/edx_ansible
-RUN sudo git fetch --all
-RUN sudo git checkout e0d/docker-latest
-RUN sudo git reset --hard origin/e0d/docker-latest
-RUN sudo git pull
+USER root
+ADD . /edx/app/edx_ansible/edx_ansible
+COPY docker/build/nginx/ansible_overrides.yml /
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
-RUN sudo ansible-playbook nginx.yml -c local \
+
+RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook nginx.yml -c local \
    -i '127.0.0.1,' \
    -e@roles/edxapp/defaults/main.yml \
    -e@roles/xqueue/defaults/main.yml \
-   -e@roles/ora/defaults/main.yml \
-   -e@roles/certs/defaults/main.yml
+   -e@roles/certs/defaults/main.yml \
+   -e@roles/forum/defaults/main.yml
 
-USER root
 RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf
 WORKDIR /etc/nginx
 CMD ["/usr/sbin/nginx"]

docker/build/nginx/ansible_overrides.yml

+---
+
+FLOCK_TLD: "edx"

docker/plays/nginx.yml

@@ -14,6 +14,7 @@
       - cms
       - xqueue
       - certs
+      - forum
       nginx_default_sites:
       - lms
       nginx_extra_sites: "{{ NGINX_EDXAPP_EXTRA_SITES }}"