Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
configuration
Commits
20292b68
Commit
20292b68
authored
Jan 04, 2016
by
Edward Zarecor
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2644 from edx/e0d/fix-nginx
E0d/fix nginx
parents
5803dac0
f95adc7c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
docker/build/nginx/Dockerfile
+7
-10
docker/build/nginx/ansible_overrides.yml
+3
-0
docker/plays/nginx.yml
+1
-0
No files found.
docker/build/nginx/
x
Dockerfile
→
docker/build/nginx/Dockerfile
View file @
20292b68
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
"
\n
daemon off;"
>>
/etc/nginx/nginx.conf
WORKDIR
/etc/nginx
CMD
["/usr/sbin/nginx"]
...
...
docker/build/nginx/ansible_overrides.yml
0 → 100644
View file @
20292b68
---
FLOCK_TLD
:
"
edx"
docker/plays/nginx.yml
View file @
20292b68
...
...
@@ -14,6 +14,7 @@
-
cms
-
xqueue
-
certs
-
forum
nginx_default_sites
:
-
lms
nginx_extra_sites
:
"
{{
NGINX_EDXAPP_EXTRA_SITES
}}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment