No longer refer to 'edxapp'

'edxapp' is an old reference to the vagrant image and it does not make
much sense.
This commit is contained in:
Régis Behmo 2018-04-12 15:45:59 +02:00
parent 1f7e68c662
commit bda9e042f9
13 changed files with 15 additions and 15 deletions

4
.gitignore vendored
View File

@ -1,7 +1,7 @@
.*.swp
config.json
edxapp/config/*.env.json
edxapp/config/*.auth.json
openedx/config/*.env.json
openedx/config/*.auth.json
nginx/config/*.conf
mysql/config/database
mysql/config/username

16
configure vendored
View File

@ -133,23 +133,23 @@ def main():
# Open edX
substitute(
os.path.join('edxapp', 'config', 'templates', 'lms.env.json.templ'),
os.path.join('edxapp', 'config', 'lms.env.json'),
os.path.join('openedx', 'config', 'templates', 'lms.env.json.templ'),
os.path.join('openedx', 'config', 'lms.env.json'),
**configurator.as_dict()
)
substitute(
os.path.join('edxapp', 'config', 'templates', 'cms.env.json.templ'),
os.path.join('edxapp', 'config', 'cms.env.json'),
os.path.join('openedx', 'config', 'templates', 'cms.env.json.templ'),
os.path.join('openedx', 'config', 'cms.env.json'),
**configurator.as_dict()
)
substitute(
os.path.join('edxapp', 'config', 'templates', 'lms.auth.json.templ'),
os.path.join('edxapp', 'config', 'lms.auth.json'),
os.path.join('openedx', 'config', 'templates', 'lms.auth.json.templ'),
os.path.join('openedx', 'config', 'lms.auth.json'),
**configurator.as_dict()
)
substitute(
os.path.join('edxapp', 'config', 'templates', 'cms.auth.json.templ'),
os.path.join('edxapp', 'config', 'cms.auth.json'),
os.path.join('openedx', 'config', 'templates', 'cms.auth.json.templ'),
os.path.join('openedx', 'config', 'cms.auth.json'),
**configurator.as_dict()
)

View File

@ -55,7 +55,7 @@ services:
lms:
build:
context: ./edxapp
context: ./openedx
environment:
SERVICE_VARIANT: lms
restart: unless-stopped
@ -70,7 +70,7 @@ services:
cms:
build:
context: ./edxapp
context: ./openedx
environment:
SERVICE_VARIANT: cms
restart: unless-stopped
@ -84,7 +84,7 @@ services:
# We could probably create one service per queue here. For small instances, it is not necessary.
lms_worker:
build:
context: ./edxapp
context: ./openedx
environment:
SERVICE_VARIANT: lms
command: ./manage.py lms celery worker --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild 100
@ -98,7 +98,7 @@ services:
cms_worker:
build:
context: ./edxapp
context: ./openedx
environment:
SERVICE_VARIANT: cms
command: ./manage.py cms celery worker --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100

View File

@ -7,7 +7,7 @@ RUN apt update && \
apt upgrade -y && \
# Global requirements
apt install -y language-pack-en git python-virtualenv build-essential software-properties-common curl git-core libxml2-dev libxslt1-dev python-pip libmysqlclient-dev python-apt python-dev libxmlsec1-dev libfreetype6-dev swig gcc g++ && \
# edxapp requirements
# openedx requirements
apt install -y gettext gfortran graphviz graphviz-dev libffi-dev libfreetype6-dev libgeos-dev libjpeg8-dev liblapack-dev libpng12-dev libxml2-dev libxmlsec1-dev libxslt1-dev nodejs npm ntp pkg-config && \
# Our requirements
apt install -y mysql-client