6
0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-11-16 10:05:18 +00:00
Commit Graph

155 Commits

Author SHA1 Message Date
Régis Behmo
1585a20558 Fix private requirements version control
private.txt was under version control.
2018-11-20 11:46:36 +01:00
Frank Anderson
2f9766a3a1 More simple nginx port mapping
Added the possibility to easily change the ports that nginx listens to.
This is useful, for instance when Apache or Nginx already runs on the
host. With this change, it is no longer necessary to edit the
docker-compose file to modify these ports.

To deploy with alternate ports, add a `.env` file with the following
contents:

```
OPENEDX_NGINX_PORT=8080
OPENEDX_NGINX_TLSPORT=8443
```
2018-11-17 09:04:56 +01:00
Frank Anderson
b949a44a78 Add "restart-openedx" make command
Close #91
2018-11-17 08:42:59 +01:00
Régis Behmo
79274f48b6 Make it easier to install extra XBlocks
As per issues #35 and #84
2018-11-13 18:40:01 +01:00
Régis Behmo
dfbc8547c8 Make sure rabbitmq restarts on failures
Rabbitmq was not configured to restart on failures. It does not explain
why rabbitmq crashes (with exit code 255, see issue #80), but this should be sufficient
as a quick fix.
2018-10-30 09:33:11 +01:00
Régis Behmo
79a98e39f6 Activate notes without fiddling with advanced settings
When the ENABLE_EDXNOTES feature is added to the CMS, it is not
necessary to modify the advanced module list to activate notes for each
course.

Close #79.
2018-10-03 19:10:25 +02:00
Régis Behmo
0bc553fbe4 Accelerate Android app build
App building is accelerated by pre-installing packages in docker image.
2018-10-03 16:06:28 +02:00
Régis Behmo
1dab77178d Fix Android apk path
Close #70
2018-10-03 15:43:21 +02:00
Régis Behmo
f03e120d9e Activate preview.localhost hostname
This allows local access to the preview endpoints. However, they should
not be used anywhere since preview.LMS_HOST is used instead.

Close #77.
2018-10-03 09:01:59 +02:00
Régis Behmo
b78d285779 Fix 'dorum' typo 2018-10-02 18:14:39 +02:00
Régis Behmo
c2d536dae5 Upgrade to hawthorn.2 2018-10-02 10:20:14 +02:00
Régis Behmo
58320e1e0f Workers need to share data with LMS/CMS
Hence, shared volumes must be identical.

Close #74.
2018-10-02 08:06:07 +02:00
Régis Behmo
b4947d10e7 Prevent package uninstall in openedx image
The `update_assets` paver task of the lms/cms attempt to manually
uninstall some old packages. We should not concern ourselves by this,
since all requirements are installed from scratch in every docker image.

Close #73.
2018-10-01 19:18:01 +02:00
Régis Behmo
30b23462d1 Fix broken celery tasks in CMS
Duplicate "environment" statement in the docker-compose.yml was causing
the first one to be forgotten. Hence, the cms celery worker was running
with LMS settings.

Close #72
2018-09-30 19:19:05 +02:00
Régis Behmo
96cd7c82d7 Fix travis build to include xqueue & notes 2018-09-30 14:51:03 +02:00
Régis Behmo
e60e0071c4 Make feature flags interactive
Feature flags are now asked to the user interactively, as part of the
configuration step. This makes defining feature flags much more simple.
2018-09-30 14:37:49 +02:00
Régis Behmo
96ab171f1c Revert "By default, don't push android image to dockerhub"
This reverts commit 8392f4a2d3.

Actually, no personal data is included in the Android image, so it's
perfectly fine to push it to docker hub.
2018-09-30 13:49:07 +02:00
Régis Behmo
8392f4a2d3 By default, don't push android image to dockerhub 2018-09-30 13:29:38 +02:00
Régis Behmo
b6ea8d9efb Fix activation flags: env supersedes Makefile.env
If users have installed previous version of Makefile.env, they will have
to delete it.
2018-09-30 12:27:32 +02:00
Régis Behmo
1357311be7 Add logging commands 2018-09-29 18:29:10 +02:00
Régis Behmo
6307a1888e Better naming for shell commands 2018-09-29 18:24:35 +02:00
Régis Behmo
050dfc9b23 Better naming for db make targets 2018-09-29 18:24:35 +02:00
Régis Behmo
4f3117f81b Better naming of android make targets 2018-09-29 18:24:33 +02:00
Régis Behmo
0d96033e1f Provide better names for help sections 2018-09-29 18:23:11 +02:00
Régis Behmo
500d690074 Add a self-documenting Make help
Picked from https://github.com/openfun/fun-platform, which itself picked
it from https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html

Running `make help` or simply `make` now produces a beautiful colored
help.
2018-09-29 18:22:06 +02:00
Régis Behmo
7f5e91a0db ACTIVATE_* env vars are only necessary during configuration 2018-09-29 17:36:25 +02:00
Régis Behmo
f85b0abac4 Add portainer as an optional feature 2018-09-29 15:10:25 +02:00
Régis Behmo
e5ce0c9a4c Documentation fix: dev containers are for hawthorn
Close #71.
2018-09-28 19:05:43 +02:00
Régis Behmo
fb36eb2d4e Make sure configurator has curl 2018-09-19 16:44:01 +02:00
Régis Behmo
22872412c3 Collect some usage stats 2018-09-18 20:25:58 +02:00
Régis Behmo
30bc6df091 Improve wait for mysql db to be ready 2018-09-16 13:24:17 +02:00
Régis Behmo
fd5af3e01c Improve configurator defaults and wording 2018-09-16 10:25:03 +02:00
Régis Behmo
75d86252bc Push notes to docker hub on 'make push' 2018-09-15 20:31:49 +02:00
Régis Behmo
4964f12725 Rename provision and oauth2 make targets 2018-09-15 20:25:13 +02:00
Régis Behmo
8f915f2d50 Test Xqueue and Notes in travis-ci 2018-09-15 20:24:35 +02:00
Régis Behmo
ae44e2beb1 Docs: Clarify missing features 2018-09-15 20:22:02 +02:00
Régis Behmo
5ca9cec888 Add optional Student Notes service
With notes, students can annotate sections of the courseware.
2018-09-15 18:11:15 +02:00
Régis Behmo
04a0fb5902 Simplify configurator
Template files are now directly loaded in the configurator container, so
that it is possible to run the configurator container directly, outside
of this project.
2018-09-15 17:22:02 +02:00
Régis Behmo
b0f2adb931 Read default settings from environment variables
Moreover, ACTIVATE_* variables are now made permanent. It is no longer
necessary to re-declare them at each call of `make configure`.
2018-09-15 15:51:41 +02:00
Régis Behmo
df95a50ab5 Fix xqueue: proper version is hawthorn 2018-09-15 15:26:05 +02:00
Régis Behmo
06f6be737c Docs: notifier is enabled
We didn't change anything, it's just that the notifier is activated by
default in hawthorn.
2018-09-15 15:13:56 +02:00
Régis Behmo
509bb91ef3 Split make assets command in two 2018-09-15 15:13:37 +02:00
Régis Behmo
e1d73660d2 Rename up & daemon make commands
The new commands are "run" and "daemonize". Older commands are
preserved, although they are undocumented.
2018-09-15 12:20:35 +02:00
Régis Behmo
adf994fa35 Add Changelog 2018-09-15 12:17:24 +02:00
Régis Behmo
f9a202083f Enable course search and discovery
Also, improved openedx logging, so that logs are not emitted twice.
2018-09-15 12:17:24 +02:00
Matt Bajor
6af7c5891a Fixes #62: Put variables at the end of the make command 2018-09-07 10:51:52 +02:00
Régis Behmo
7e5dda28f0 Make sure configurator is pushed on 'make push'
Close #61.
2018-09-06 07:35:26 +02:00
Régis Behmo
edec42779f Fix travis builds on branches
For some reason, `docker login` doesn't work on pull requests. So we run
"docker login" only during deploy, and only on master and release
branches.
2018-09-05 14:04:38 +02:00
Régis Behmo
f76a4feb53 Make all outside email go from the same address
For most admins, it doesn't make much sense to send emails from many
email addresses. Here, we set a sane default that can be easily
overridden.
2018-09-05 12:24:07 +02:00
Régis Behmo
3587a187cd Get PWD to work with "sudo"
The PWD environment variable is not available in the Makefile when a
"make" command is run with "sudo".

Close #50
Close #60
2018-09-04 12:13:18 +02:00