.env.example

@@ -0,0 +1 @@
+DEBUG=1

playbooks/environments/production/group_vars/all/01_vars.yaml

@@ -1,5 +1,5 @@
 env: production
 domain: id.blender.org
 # Production uWSGI app currently runs on the same server
-host: "127.0.0.1:{{ port }}"
+single_host: true
 mailto: sintel-cron-jobs+bid@blender.org

playbooks/shared

@@ -1 +1 @@
-Subproject commit 8d3133685b443598df6dfe157900cffc4b0def7a
+Subproject commit ec8002cfeea2e129bd8cb3aeb0e93bccf9b259c8

playbooks/vars_common.yaml

@@ -1,5 +1,4 @@
 domain: id.staging.blender.org
-port: 8100
 project_name: Blender ID
 project_slug: blender-id
 service_name: "{{ project_slug }}-{{ env }}"
@@ -9,16 +8,19 @@ uwsgi_module: blenderid.wsgi:application
 python_version: "3.10"
 delete_venv: false  # set to true if venv has to be re-created from scratch
 
+# Set to true if ingress == application:
+# meaning that SSL is terminated by and Django app is run on the same host.
+single_host: false
+
 dir:
   source: "/opt/{{ service_name }}"
   static: "/var/www/{{ service_name }}/static"
   media: "/var/www/{{ service_name }}/media"
   errors: "/var/www/{{ service_name }}/html/errors"
-script_dir: /usr/local/bin
-backup_dir: /mnt/backup
 
 env_file: "{{ dir.source }}/.env"
 uwsgi_pid: "{{ dir.source }}/{{ service_name }}.pid"
+uwsgi_socket: "{{ dir.source }}/uwsgi.sock"
 
 nginx:
   user: www-data
@@ -43,3 +45,11 @@ branch: production
 
 ssl_only: false
 PGSSLROOTCERT: /usr/local/share/ca-certificates/cloud-init-ca-cert-1.crt
+
+include_common_services:
+  - background
+  - background-restart
+  - backup-service-dirs
+  - clearsessions
+  - delete-completed-tasks
+  - process-deletion-requests