diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000000000000000000000000000000000000..f8b4888565caadc7510be75682268d6c18edd6de --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000000000000000000000000000000000000..6b6114114f4e89a1f2d0e911ff090e541af1260c --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/deployment/FileContentIndex/5402c864-f018-403f-84d7-8f43816bcf71.vsidx b/.vs/deployment/FileContentIndex/5402c864-f018-403f-84d7-8f43816bcf71.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..48cd3b91b7e6d56b5ecd505f99083eda66ecf0c9 Binary files /dev/null and b/.vs/deployment/FileContentIndex/5402c864-f018-403f-84d7-8f43816bcf71.vsidx differ diff --git a/.vs/deployment/v17/.wsuo b/.vs/deployment/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..221aa06cf10ac0dd63bda98435bc0286285c54fb Binary files /dev/null and b/.vs/deployment/v17/.wsuo differ diff --git a/.vs/deployment/v17/DocumentLayout.json b/.vs/deployment/v17/DocumentLayout.json new file mode 100644 index 0000000000000000000000000000000000000000..32d60607a1ff12e067f6ee42d7bec2d1c7fab30a --- /dev/null +++ b/.vs/deployment/v17/DocumentLayout.json @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "E:\\polaris\\deployment\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..32f7291b9f79801a9ee87d67c7cb5eff997bbbef Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index 9cf8ca9e5b79c2da0b7fe9c19ee00e860d762c07..d8c6d1e75cd31432ac408a4334205678c66c03f6 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Each folder contains one of the components of ### Login in the docker registry If you are not already logged in, you need to authenticate to the Container Registry by using your GitLab username and password. If you have Two-Factor Authentication enabled, use a Personal Access Token instead of a password. ```bash -docker login registry.digitallearning.gmbh +docker login registry.git.rwth-aachen.de ``` ### Create Docker network @@ -78,7 +78,7 @@ Example configuration file `configuration/h5p_engines.yml` ```yml h5p_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://git.rwth-aachen.de/polaris/public/engines/activities.git" analytics_token: "b6a4ec069ef9f688e781161d46c2a85c14a761a4eaf0074099656c7de44a65d9" ``` @@ -86,7 +86,7 @@ Example configuration file `configuration/moodle_engines.yml` ```yml moodle_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://git.rwth-aachen.de/polaris/public/engines/activities.git" analytics_token: "0482a0f3259c966dfddb38de867573a95995ee5e10898bb71f9ae0e99efe54ef" ``` diff --git a/analytics-engine/docker-compose.yml b/analytics-engine/docker-compose.yml index 2e83d97505048f1a35f9c53cade19c5547b80627..70bdcaa660b5e000f32c7935bab6dcb7443196eb 100644 --- a/analytics-engine/docker-compose.yml +++ b/analytics-engine/docker-compose.yml @@ -20,7 +20,7 @@ services: scheduler: user: "${UID}:${GID}" - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped expose: - 8000 @@ -42,7 +42,7 @@ services: beat: user: "${UID}:${GID}" - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped entrypoint: celery command: -A scheduler.worker beat -l info --scheduler celery_sqlalchemy_scheduler.schedulers:DatabaseScheduler @@ -57,7 +57,7 @@ services: worker: user: "${UID}:${GID}" - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped entrypoint: celery command: -A scheduler.worker worker -l info diff --git a/analytics-engine/docker-compose.yml.local b/analytics-engine/docker-compose.yml.local index 6ee9d9f5230b20ef677ef6e0803543bf1b62edeb..9ba0472a5db39f438dd26fa1d106c44458ef967d 100644 --- a/analytics-engine/docker-compose.yml.local +++ b/analytics-engine/docker-compose.yml.local @@ -19,7 +19,7 @@ services: - internal scheduler: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped expose: - 8000 @@ -36,7 +36,7 @@ services: - "./configuration:/app/configuration" beat: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped entrypoint: celery command: -A scheduler.worker beat -l info --scheduler celery_sqlalchemy_scheduler.schedulers:DatabaseScheduler @@ -50,7 +50,7 @@ services: - "./configuration:/app/configuration" worker: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: unless-stopped entrypoint: celery command: -A scheduler.worker worker -l info diff --git a/rights-engine/docker-compose.yml b/rights-engine/docker-compose.yml index b446484a39140e657916a1df21df6d772c59626d..aaf680967bb68574a680dd6a6f173a1342fe39e9 100644 --- a/rights-engine/docker-compose.yml +++ b/rights-engine/docker-compose.yml @@ -20,7 +20,7 @@ services: - internal rights-engine: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine restart: unless-stopped expose: - 80 @@ -45,7 +45,7 @@ services: - "./data_disclosure_zips/:/usr/src/app/backend/data_disclosure_zips" beat: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine restart: unless-stopped entrypoint: celery command: -A backend beat -l info @@ -63,7 +63,7 @@ services: - "./id_rsa:/usr/src/app/backend/id_rsa" worker: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine restart: unless-stopped entrypoint: celery command: -A backend worker --loglevel=debug diff --git a/rights-engine/docker-compose.yml.local b/rights-engine/docker-compose.yml.local index e8086f85a7be465998cf6ad0a795ba412c830080..e14c992255d1026ef88be040aaefe097e403a35f 100644 --- a/rights-engine/docker-compose.yml.local +++ b/rights-engine/docker-compose.yml.local @@ -20,7 +20,7 @@ services: - internal rights-engine: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: unless-stopped expose: - 80 @@ -41,7 +41,7 @@ services: - "./data_disclosure_zips/:/usr/src/app/backend/data_disclosure_zips" beat: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: unless-stopped entrypoint: celery command: -A backend beat -l info @@ -59,7 +59,7 @@ services: - "./id_rsa:/usr/src/app/backend/id_rsa" worker: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: unless-stopped entrypoint: celery command: -A backend worker --loglevel=debug diff --git a/single-compose-with-moodle/configuration/h5p_engines.yml b/single-compose-with-moodle/configuration/h5p_engines.yml index 85eb85b823685a08abbd56663259fd87035b7365..84d3f33d4460453fcbe3870860b293ac37358649 100644 --- a/single-compose-with-moodle/configuration/h5p_engines.yml +++ b/single-compose-with-moodle/configuration/h5p_engines.yml @@ -1,4 +1,4 @@ h5p_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/dummy-engine.git" analytics_token: "b6a4ec069ef9f688e781161d46c2a85c14a761a4eaf0074099656c7de44a65d9" diff --git a/single-compose-with-moodle/configuration/moodle_engines.yml b/single-compose-with-moodle/configuration/moodle_engines.yml index f6e0c1c4a3fb31747513e62adcc72e053db70a99..ae20ba804497b78616cd7cc1934d052bac57d144 100644 --- a/single-compose-with-moodle/configuration/moodle_engines.yml +++ b/single-compose-with-moodle/configuration/moodle_engines.yml @@ -1,5 +1,5 @@ moodle_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/activities.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/activities.git" analytics_token: "0482a0f3259c966dfddb38de867573a95995ee5e10898bb71f9ae0e99efe54ef" diff --git a/single-compose-with-moodle/configuration/moodle_engines.yml.bak b/single-compose-with-moodle/configuration/moodle_engines.yml.bak index 485137ff3c35af36b697f9c6af0c1584fcae0b5d..7463ba877b2246c46af01753944fdce226620587 100644 --- a/single-compose-with-moodle/configuration/moodle_engines.yml.bak +++ b/single-compose-with-moodle/configuration/moodle_engines.yml.bak @@ -1,5 +1,5 @@ moodle_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/dummy-engine.git" analytics_token: "0482a0f3259c966dfddb38de867573a95995ee5e10898bb71f9ae0e99efe54ef" diff --git a/single-compose/configuration/h5p_engines.yml b/single-compose/configuration/h5p_engines.yml index 85eb85b823685a08abbd56663259fd87035b7365..84d3f33d4460453fcbe3870860b293ac37358649 100644 --- a/single-compose/configuration/h5p_engines.yml +++ b/single-compose/configuration/h5p_engines.yml @@ -1,4 +1,4 @@ h5p_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/dummy-engine.git" analytics_token: "b6a4ec069ef9f688e781161d46c2a85c14a761a4eaf0074099656c7de44a65d9" diff --git a/single-compose/configuration/h5p_engines.yml.bak b/single-compose/configuration/h5p_engines.yml.bak index 85eb85b823685a08abbd56663259fd87035b7365..84d3f33d4460453fcbe3870860b293ac37358649 100644 --- a/single-compose/configuration/h5p_engines.yml.bak +++ b/single-compose/configuration/h5p_engines.yml.bak @@ -1,4 +1,4 @@ h5p_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/dummy-engine.git" analytics_token: "b6a4ec069ef9f688e781161d46c2a85c14a761a4eaf0074099656c7de44a65d9" diff --git a/single-compose/configuration/moodle_engines.yml b/single-compose/configuration/moodle_engines.yml index 485137ff3c35af36b697f9c6af0c1584fcae0b5d..7463ba877b2246c46af01753944fdce226620587 100644 --- a/single-compose/configuration/moodle_engines.yml +++ b/single-compose/configuration/moodle_engines.yml @@ -1,5 +1,5 @@ moodle_statements_count_engine: crontab: "*/1 * * * *" - repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@gitlab.digitallearning.gmbh/polaris/engines/dummy-engine.git" + repo: "https://scheduler:glpat-MsDsrHMH-k3-DzEfNRgk@git.rwth-aachen.de/polaris/engines/dummy-engine.git" analytics_token: "0482a0f3259c966dfddb38de867573a95995ee5e10898bb71f9ae0e99efe54ef" diff --git a/single-compose/docker-compose.yml b/single-compose/docker-compose.yml index 2362f0190405fe8609a91469fea9b8dc62481441..a7c123dcb66d858f7a2dd99aa8668e11bcf57141 100644 --- a/single-compose/docker-compose.yml +++ b/single-compose/docker-compose.yml @@ -27,7 +27,7 @@ services: command: redis-server --requirepass ${REDIS_PASSWORD} rights-engine: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: always ports: - 8004:80 @@ -44,7 +44,7 @@ services: - "./data_disclosure_zips/:/usr/src/app/backend/data_disclosure_zips" beat: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: always entrypoint: celery command: -A backend beat -l info @@ -60,7 +60,7 @@ services: - "./id_rsa:/usr/src/app/backend/id_rsa" worker: - image: registry.digitallearning.gmbh/polaris/rights-engine/rights-engine:latest + image: registry.git.rwth-aachen.de/polaris/rights-engine/rights-engine:latest restart: always entrypoint: celery command: -A backend worker --loglevel=debug @@ -94,7 +94,7 @@ services: command: redis-server --requirepass ${REDIS_PASSWORD} scheduler: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: always ports: - 8000:8000 @@ -108,7 +108,7 @@ services: - "./configuration:/app/configuration" beat_analytics: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: always entrypoint: celery command: -A scheduler.worker beat -l info --scheduler celery_sqlalchemy_scheduler.schedulers:DatabaseScheduler @@ -122,7 +122,7 @@ services: - "./configuration:/app/configuration" worker_analytics: - image: registry.digitallearning.gmbh/polaris/analytics-engine/scheduler:latest + image: registry.git.rwth-aachen.de/polaris/analytics-engine/scheduler:latest restart: always entrypoint: celery command: -A scheduler.worker worker -l info @@ -137,7 +137,7 @@ services: - "./configuration:/app/configuration" dashboard: - image: registry.digitallearning.gmbh/polaris/dashboard-example/dashboard-example:latest + image: registry.git.rwth-aachen.de/polaris/dashboard-example/dashboard-example:latest restart: always ports: - 8005:80