Add isimip-files role and fix issues

group_vars/all.yml

@@ -1,3 +1,4 @@
-env: "prod"
-data_url: "{% if env == 'prod' %}data.isimip.org{% else %}{{ env }}.isimip.org{% endif %}"
-files_url: "files.isimip.org"
+env: prod
+data_url: data.isimip.org
+data_gunicorn_port: 9000
+files_url: files.isimip.org

main.yml

@@ -27,6 +27,8 @@
   become: yes
   become_user: root
   roles:
+  - role: isimip-files
+    tags: isimip-files
   - role: isimip-files-api
     tags: isimip-files-api
   - role: isimip-publisher

roles/config/tasks/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Copy /root/.bash_aliases
   copy:
     src: bash_aliases

roles/isimip-data/tasks/main.yml

@@ -19,7 +19,6 @@
     - postgresql15-server
     - postgresql15-devel
     state: present
-
 - name: Create /srv/www/prod or /srv/www/dev for isimip-data
   file:
     path: /srv/www/{{ env }}
@@ -59,3 +58,11 @@
     dest: "/etc/systemd/system/{{ env }}.service"
   notify:
   - Restart gunicorn
+
+- name: Create nginx config for data.isimip.org
+  template:
+    src: "{{ data_url }}.conf"
+    dest: /etc/nginx/vhosts.d/{{ data_url }}.conf
+  when: "'data' in group_names"
+  notify:
+  - Restart nginx

roles/nginx/templates/data.isimip.org.conf → roles/isimip-data/templates/data.isimip.org.conf

@@ -26,10 +26,10 @@ server {
     }
     location /static/ {
         add_header "Access-Control-Allow-Origin" *;
-        alias /home/isimip-data/{{ env }}/static_root/;
+        alias /home/isimip/{{ env }}/static_root/;
     }
     location /media/ {
-        alias /home/isimip/prod/media_root/;
+        alias /home/isimip/{{ env }}/media_root/;
     }
 
     error_page 502 /502.html;

roles/isimip-data/templates/data.service

@@ -12,6 +12,14 @@ EnvironmentFile=/srv/www/{{ env }}/.env
 LogsDirectory=django/{{ env }} gunicorn/{{ env }}
 RuntimeDirectory=gunicorn/{{ env }}
 
+Environment=GUNICORN_BIN=env/bin/gunicorn
+Environment=GUNICORN_WORKER=3
+Environment=GUNICORN_PORT={{ data_gunicorn_port }}
+Environment=GUNICORN_TIMEOUT=120
+Environment=GUNICORN_PID_FILE=/run/gunicorn/{{ env }}/pid
+Environment=GUNICORN_ACCESS_LOG_FILE=/var/log/gunicorn/{{ env }}/access.log
+Environment=GUNICORN_ERROR_LOG_FILE=/var/log/gunicorn/{{ env }}/error.log
+
 ExecStart=/bin/sh -c '${GUNICORN_BIN} \
   --workers ${GUNICORN_WORKER} \
   --pid ${GUNICORN_PID_FILE} \

roles/isimip-files/tasks/main.yml

@@ -0,0 +1,6 @@
+- name: Create config for files.isimip.org
+  template:
+    src: "{{ files_url }}.conf"
+    dest: /etc/nginx/vhosts.d/{{ files_url }}.conf
+  notify:
+  - Restart nginx

roles/isimip-publisher/tasks/main.yml

@@ -29,7 +29,7 @@
     update: no
   become_user: isimip
 
-- name: /data is present on files.isimip.org
+- name: Create /data
   file:
     path: "{{ item }}"
     state: directory

roles/nginx/handlers/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Restart nginx
   service:
     name: nginx

roles/nginx/tasks/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Install nginx and certbot
   zypper:
     name:
@@ -8,22 +6,6 @@
     - python3-certbot-nginx
     state: present
 
-- name: Create nginx config for data.isimip.org
-  template:
-    src: "{{ data_url }}.conf"
-    dest: /etc/nginx/vhosts.d/{{ data_url }}.conf
-  when: "'data' in group_names"
-  notify:
-  - Restart nginx
-
-- name: Create config for files.isimip.org
-  template:
-    src: "{{ files_url }}.conf"
-    dest: /etc/nginx/vhosts.d/{{ files_url }}.conf
-  when: "'files' in group_names"
-  notify:
-  - Restart nginx
-
 - name: Copy 502.html
   copy:
     src: 502.html

roles/packages/tasks/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Install common packages
   zypper:
     name: "{{ packages }}"

roles/packages/vars/main.yml

@@ -1,5 +1,3 @@
----
-
 packages:
 # utils
 - pwgen

roles/redis/files/redis.service

@@ -8,6 +8,7 @@ Group=redis
 ExecStart=/usr/sbin/redis-server /etc/redis/redis.conf
 ExecStop=/usr/bin/redis-cli shutdown
 Restart=always
+RestartSec=5
 
 [Install]
 WantedBy=multi-user.target

roles/redis/handlers/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Restart redis
   service:
     name: nginx

roles/redis/tasks/main.yml

@@ -1,5 +1,3 @@
----
-
 - name: Install redis
   zypper:
     name: redis