Simplify settings for archmanweb

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
 

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

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

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

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.