Skip to content
Snippets Groups Projects
Commit 91cad746 authored by Hinrikus Wolf's avatar Hinrikus Wolf
Browse files

fix remaining deployment bugs

parent 5b1a40f7
No related branches found
No related tags found
1 merge request!3Unify uwsgi python
This commit is part of merge request !3. Comments created here will be created in the context of that merge request.
---
#https://github.com/ansible/ansible/issues/42983
- name: ensure there exists a .ansible folder
file:
path: "{{app_path}}/.ansible"
state: directory
owner: "{{app_user}}"
group: "{{app_group}}"
- name: ensure data model upgrades are applied
command: "{{app_path}}/bin/python {{app_path}}/server.py db upgrade"
command: "{{app_venv}}/bin/python {{app_path}}/lipclms.py db upgrade"
args:
chdir: "{{app_path}}"
become: yes
become_user: "{{app_user}}"
notify:
- "restart uwsgi instance {{app.instance}}"
- name: ensure the folder from above is not present anymore
file:
path: "{{app_path}}/.ansible"
state: absent
---
# file: protokollsystem/tasks/main.yml
#https://github.com/ansible/ansible/issues/42983
- name: ensure there exists a .ansible folder
file:
path: "{{app_path}}/.ansible"
state: directory
owner: "{{app_user}}"
group: "{{app_group}}"
- name: check our config
command: "{{app_path}/bin/python {{app_path}}/configproxy.py check --log-level warning"
command: "{{app_venv}}/bin/python {{app_path}}/configproxy.py check --log-level warning"
args:
chdir: "{{app_path}}"
become: yes
......@@ -10,7 +19,7 @@
changed_when: no
- name: ensure data model upgrades are applied
command: "{{app_path}}/bin/python {{app_path}}/server.py db upgrade"
command: "{{app_venv}}/bin/python {{app_path}}/server.py db upgrade"
args:
chdir: "{{app_path}}"
become: yes
......@@ -18,6 +27,11 @@
notify:
- "restart uwsgi instance {{app.instance}}"
- name: ensure the folder from above is not present anymore
file:
path: "{{app_path}}/.ansible"
state: absent
- name: ensure we have our local templates
copy:
src: "{{ protokolle_local_templates }}"
......
---
#https://github.com/ansible/ansible/issues/42983
- name: ensure there exists a .ansible folder
file:
path: "{{app_path}}/.ansible"
state: directory
owner: "{{app_user}}"
group: "{{app_group}}"
- name: ensure data model upgrades are applied
command: "{{app_path}}/bin/python {{app_path}}/server.py db upgrade"
command: "{{app_venv}}/bin/python {{app_path}}/server.py db upgrade"
args:
chdir: "{{app_path}}"
become: yes
become_user: "{{app_user}}"
notify:
- "restart uwsgi instance {{app.instance}}"
- name: ensure the folder from above is not present anymore
file:
path: "{{app_path}}/.ansible"
state: absent
......@@ -78,7 +78,6 @@ CALENDAR_TIMEZONE_MAP = {
SESSION_PROTECTION = "strong"
SECURITY_KEY = "{{ protokolle_security_key }}"
from common.auth import LdapManager, ADManager
AUTH_MAX_DURATION = {{ protokolle_auth_max_duration }}
AUTH_BACKENDS = [
......
......@@ -8,7 +8,7 @@ app_venv: /var/www/meckerkasten
app_program: meckerkasten/wsgi.py
app_callable: application
app_command: "runserver"
app_mountpoint: /meckerkasten
app_mountpoint: /
app_mules: 0
app_enable_threads: false
app_harakiri: 5
......@@ -34,7 +34,7 @@ meckerkasten_mail_host: 'mail.example.invalid'
meckerkasten_allowed_hosts: ['example.com']
meckerkasten_mail_user: ''
meckerkasten_mail_password: ''
meckerkasten_mail_port: ''
meckerkasten_mail_port: '25'
app_service_env:
- MECKERKASTEN_WEB_ROOT=/var/www/meckerkasten/
......
......@@ -35,5 +35,7 @@ app_secret_config_keys: ["security_key"]
protokolle_celery_broker: 'redis://localhost:6379/0'
protokolle_celery_concurrency: 4
protokolle_wiki_type: MEDIAWIKI
protokolle_logos: []
protokolle_sentry_dsn: "https://3bbe6efca11645488bc1fb7297013e3a:4747c40e928d401e8e5e9aac49d3b42d@sentry.fsmpi.rwth-aachen.de//4"
......@@ -20,8 +20,8 @@ app_db_type: 'postgres'
app_additional_software: []
app_deploy_key: "{{ inventory_dir }}/files/deploy-keys/redeleitsystem"
app_git_url: "git@git.fsmpi.rwth-aachen.de:redl/redeleitsystem.git"
app_deploy_key: ""
app_git_url: "https://git.fsmpi.rwth-aachen.de/redl/redeleitsystem.git"
app_git_version: HEAD
app_requirements_file: requirements.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment