diff --git a/roles/archmanweb/defaults/main.yml b/roles/archmanweb/defaults/main.yml index 7f3e0e2814d49cbed975faab31c5a15ec9872942..9fe2a14d7ff26b8df3408c76eecf62ba569ff70e 100644 --- a/roles/archmanweb/defaults/main.yml +++ b/roles/archmanweb/defaults/main.yml @@ -6,7 +6,6 @@ archmanweb_allowed_hosts: ["{{ archmanweb_domain }}"] archmanweb_nginx_conf: '/etc/nginx/nginx.d/archmanweb.conf' archmanweb_repository: 'https://github.com/lahwaacz/archmanweb.git' archmanweb_version: deployment -archmanweb_django_settings_module: production.settings #archmanweb_pgp_key: ['932BA3FA0C86812A32D1F54DAB5964AEB9FEDDDC'] # Jakub Klinkovský (lahwaacz) archmanweb_forced_deploy: false diff --git a/roles/archmanweb/tasks/main.yml b/roles/archmanweb/tasks/main.yml index 9d4029e89ccce2bd91d11f05049a579d1e011129..343c70fc3fabee1e807d8f2127b4e386e9e2e0ee 100644 --- a/roles/archmanweb/tasks/main.yml +++ b/roles/archmanweb/tasks/main.yml @@ -44,7 +44,7 @@ register: release - name: configure archmanweb - template: src=local_settings.py.j2 dest={{ archmanweb_dir }}/repo/production/local_settings.py owner=archmanweb group=archmanweb mode=0660 + template: src=local_settings.py.j2 dest={{ archmanweb_dir }}/repo/local_settings.py owner=archmanweb group=archmanweb mode=0660 register: config no_log: true @@ -66,8 +66,6 @@ - migrate - collectstatic - man_drop_cache - environment: - DJANGO_SETTINGS_MODULE: "{{ archmanweb_django_settings_module }}" become: true become_user: archmanweb when: db_created.changed or release.changed or config.changed or archmanweb_forced_deploy diff --git a/roles/archmanweb/templates/archmanweb.ini.j2 b/roles/archmanweb/templates/archmanweb.ini.j2 index 29e95a3adae16a15d448e394f245c1dc8f27b79f..2b2fb33135c3b778ddb3dc2e20ae306532c5afa4 100644 --- a/roles/archmanweb/templates/archmanweb.ini.j2 +++ b/roles/archmanweb/templates/archmanweb.ini.j2 @@ -1,7 +1,6 @@ [uwsgi] plugins = python chdir = {{ archmanweb_dir }}/repo -env = DJANGO_SETTINGS_MODULE={{ archmanweb_django_settings_module }} module = wsgi:application socket = /run/uwsgi/archmanweb.sock chmod-socket = 660 diff --git a/roles/archmanweb/templates/archmanweb_update.service.j2 b/roles/archmanweb/templates/archmanweb_update.service.j2 index 94ff1b921662a2970be91013ed5c5f91f1001d52..21961935a7d77758341b12b6fc26e157c77232cc 100644 --- a/roles/archmanweb/templates/archmanweb_update.service.j2 +++ b/roles/archmanweb/templates/archmanweb_update.service.j2 @@ -5,7 +5,6 @@ Description=Update archmanweb database Type=oneshot User=archmanweb WorkingDirectory={{ archmanweb_dir }}/repo/ -Environment=DJANGO_SETTINGS_MODULE="{{ archmanweb_django_settings_module }}" ExecStart=/usr/bin/python3 manage.py man_update --cache-dir {{ archmanweb_cache_dir }} ProtectSystem=full diff --git a/roles/archmanweb/templates/local_settings.py.j2 b/roles/archmanweb/templates/local_settings.py.j2 index 2513be3f9bd4ac30d9911e03b83b487d0584b9b3..611d359e14cfc9b4b0f4ccd8efe5e4564cca3a08 100644 --- a/roles/archmanweb/templates/local_settings.py.j2 +++ b/roles/archmanweb/templates/local_settings.py.j2 @@ -1,3 +1,6 @@ +# Import the common settings, which may be overridden in this file. +from settings import * + DEBUG = False # Make this unique, and don't share it with anybody.