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
cfb4e79a
Commit
cfb4e79a
authored
Dec 29, 2015
by
Edward Zarecor
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2643 from edx/e0d/revert-push-to-master
E0d/revert push to master
parents
b39712c4
19566f54
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
145 deletions
+10
-145
docker/build/nginx/ansible_overrides.yml
+0
-3
docker/build/nginx/xDockerfile
+10
-7
docker/plays/nginx.yml
+0
-1
playbooks/roles/container/defaults/main.yml
+0
-25
playbooks/roles/container/meta/main.yml
+0
-20
playbooks/roles/container/tasks/main.yml
+0
-20
playbooks/roles/docker/defaults/main.yml
+0
-25
playbooks/roles/docker/meta/main.yml
+0
-23
playbooks/roles/docker/tasks/main.yml
+0
-21
No files found.
docker/build/nginx/ansible_overrides.yml
deleted
100644 → 0
View file @
b39712c4
---
FLOCK_TLD
:
"
edx"
docker/build/nginx/Dockerfile
→
docker/build/nginx/
x
Dockerfile
View file @
cfb4e79a
FROM edxops/precise-common:latest
MAINTAINER edxops
ADD
. /edx/app/edx_ansible/edx_ansible
COPY
docker/build/nginx/ansible_overrides.yml /
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
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
RUN
/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook nginx.yml
-c
local
\
RUN sudo 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/certs/defaults/main.yml
\
-e
@roles/forum/defaults/main.yml
-e@roles/ora/defaults/main.yml \
-e@roles/certs/defaults/main.yml
USER root
RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf
WORKDIR /etc/nginx
CMD ["/usr/sbin/nginx"]
...
...
docker/plays/nginx.yml
View file @
cfb4e79a
...
...
@@ -14,7 +14,6 @@
-
cms
-
xqueue
-
certs
-
forum
nginx_default_sites
:
-
lms
nginx_extra_sites
:
"
{{
NGINX_EDXAPP_EXTRA_SITES
}}"
...
...
playbooks/roles/container/defaults/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
##
# Defaults for role container
#
#
# vars are namespaced with the module name.
#
container_role_name
:
container
#
# OS packages
#
container_debian_pkgs
:
[]
container_redhat_pkgs
:
[]
playbooks/roles/container/meta/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
##
# Role includes for role container
#
# Example:
#
# dependencies:
# - {
# role: my_role
# my_role_var0: "foo"
# my_role_var1: "bar"
# }
playbooks/roles/container/tasks/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
#
#
# Tasks for role container
#
# Overview:
#
# This is a special role for providing common, container specific
# tasks and serving as a common ancestor for specific container
# providers, say, docker and rocket.
#
playbooks/roles/docker/defaults/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
##
# Defaults for role docker
#
#
# vars are namespaced with the module name.
#
docker_role_name
:
docker
#
# OS packages
#
docker_debian_pkgs
:
[]
docker_redhat_pkgs
:
[]
playbooks/roles/docker/meta/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
##
# Role includes for role docker
#
# Example:
#
# dependencies:
# - {
# role: my_role
# my_role_var0: "foo"
# my_role_var1: "bar"
# }
dependencies
:
-
container
playbooks/roles/docker/tasks/main.yml
deleted
100644 → 0
View file @
b39712c4
---
#
# edX Configuration
#
# github: https://github.com/edx/configuration
# wiki: https://github.com/edx/configuration/wiki
# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
# license: https://github.com/edx/configuration/blob/master/LICENSE.TXT
#
#
#
# Tasks for role docker
#
# Overview:
#
# This is a special role for providing common, docker specific tasks.
#
# Dependencies:
#
# Inherits from the container role via meta/main.yml
#
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