add gpodder worker and heartbeat, fix redis connection. now seems to be basically working.

README.md

@@ -34,6 +34,7 @@ You can also use statically configured credentials, which is enough for single-u
 | Self-Signed   | -          | ✔️      | ❓       | ✔️         | ❓        | N/A       |
 | grafana       | iot        | ✔️      | ❓       | ✔️         | ❓        | ❓        |
 | Selfoss       | news       | ❌     | ✔️        | ❓        | ❓        | ❓        |
+| gPodder       | gpodder    | ✔️     | ❓        | ❓        | ✔️        | ❌        |
 
 You don't have to setup all roles, simply select the subset you require.
 Please take a look inside the respective folders of the roles, they often contain a `DESIGN.md` file explaining the intricacies of the specific software or its configuration.

roles/gpodder/files/etc_logrotate_gpodder

@@ -0,0 +1,8 @@
+/home/gpodder/*.log {
+        daily
+        missingok
+        rotate 5
+        compress
+        notifempty
+	su gpodder gpodder
+}

roles/gpodder/tasks/gpodder.yml

@@ -53,6 +53,14 @@
   service: name=gpodder state=stopped
   ignore_errors: True
 
+- name: Stop old gpodder worker instance
+  service: name=gpodder_worker state=stopped
+  ignore_errors: True
+
+- name: Stop old gpodder beat instance
+  service: name=gpodder_beat state=stopped
+  ignore_errors: True
+
 - name: Remove old gpodder directory
   shell: rm -rf /home/gpodder/gpodder
 
@@ -80,6 +88,9 @@
 - name: Install dependencies for production in virtualenv
   shell: bash -c 'source venv/bin/activate && pip install -r requirements-setup.txt' chdir=/home/gpodder/gpodder
 
+- name: Create gpodder logs directory
+  file: state=directory path=/home/gpodder/logs owner=gpodder group=gpodder
+
 - name: Create gpodder media directory
   file:
     state: directory
@@ -88,10 +99,31 @@
     group: gpodder
     mode: 0750
 
-# TODO put env somewhere so we can use it for systemd unit, migration and cron
+- name: Add gpodder wrapper script
+  template:
+    src=home_gpodder_env.j2
+    dest=/home/gpodder/env.sh
+    owner=gpodder
+    group=gpodder
+    mode=0750
+
+- name: Fix ownership of installed files
+  shell: chown -R gpodder:gpodder /home/gpodder/gpodder
+
+- name: Run collecting script for static files
+  become: true
+  become_user: gpodder
+  shell: ./env.sh python manage.py collectstatic --no-input chdir=/home/gpodder
+
+#- name: Run compiling script for messages
+#  become: true
+#  become_user: gpodder
+#  shell: ./env.sh python manage.py compilemessages chdir=/home/gpodder
 
 - name: Run database migration script
-  shell: bash -c 'source venv/bin/activate && DATABASE_URL=postgres://{{ gpodder_db_username }}:{{ gpodder_db_password }}@localhost:5432/{{ gpodder_db_database }}?sslmode=disable SECRET_KEY={{ gpodder_secret }} python manage.py migrate' chdir=/home/gpodder/gpodder
+  become: true
+  become_user: gpodder
+  shell: ./env.sh python manage.py migrate chdir=/home/gpodder
 
 - name: Add systemd service to start gpodder automatically
   template:
@@ -100,12 +132,38 @@
     owner=root
     group=root
 
+- name: Add systemd service to start gpodder worker automatically
+  template:
+    src=etc_systemd_system_gpodder_worker.j2
+    dest=/etc/systemd/system/gpodder_worker.service
+    owner=root
+    group=root
+
+- name: Add systemd service to start gpodder beat automatically
+  template:
+    src=etc_systemd_system_gpodder_beat.j2
+    dest=/etc/systemd/system/gpodder_beat.service
+    owner=root
+    group=root
+
 - name: Register new gpodder service
   systemd: name=gpodder daemon_reload=yes enabled=yes
 
+- name: Register new gpodder worker service
+  systemd: name=gpodder_worker daemon_reload=yes enabled=yes
+
+- name: Register new gpodder beat service
+  systemd: name=gpodder_beat daemon_reload=yes enabled=yes
+
 - name: Start new gpodder instance
   service: name=gpodder state=started
 
+- name: Start new gpodder worker instance
+  service: name=gpodder_worker state=started
+
+- name: Start new gpodder beat instance
+  service: name=gpodder_beat state=started
+
 # TODO cron jobs
 # envdir envs/dev python manage.py update-toplist
 # envdir envs/dev python manage.py update-episode-toplist
@@ -117,6 +175,14 @@
 # envdir envs/dev python manage.py feed-downloader --toplist --max <max-updates>
 # envdir envs/dev python manage.py feed-downloader --update-new --max <max-updates>
 
+- name: Configure gpodder logrotate
+  copy:
+    src=etc_logrotate_gpodder
+    dest=/etc/logrotate.d/gpodder
+    owner=root
+    group=root
+    mode=0644
+
 - name: Create the Apache gpodder sites config files
   template:
     src=etc_apache2_sites-available_gpodder.j2

roles/gpodder/templates/etc_apache2_sites-available_gpodder.j2

@@ -27,6 +27,20 @@
     Alias                   /static /home/gpodder/gpodder/static
     ProxyPassMatch          ^/static !
 
+    Alias                   /favicon.ico /home/gpodder/gpodder/static/favicon.ico
+    ProxyPassMatch          ^/favicon.ico !
+
+    Alias                   /favicon.png /home/gpodder/gpodder/static/favicon.png
+    ProxyPassMatch          ^/favicon.png !
+
+    <Directory /data/gpodder>
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    Alias                   /media /data/gpodder
+    ProxyPassMatch          ^/media !
+
     ProxyPass               / http://localhost:{{ gpodder_internal_port }}/
     ProxyPassReverse        / http://localhost:{{ gpodder_internal_port }}/
 </VirtualHost>

roles/gpodder/templates/etc_systemd_system_gpodder.j2

@@ -9,22 +9,10 @@ Type=simple
 User=gpodder
 Restart=always
 RestartSec=3
-WorkingDirectory=/home/gpodder/gpodder
-ExecStart=bash -c 'source venv/bin/activate && python manage.py runserver 127.0.0.1:{{ gpodder_internal_port }}'
-Environment=DATABASE_URL=postgres://{{ gpodder_db_username }}:{{ gpodder_db_password }}@localhost:5432/{{ gpodder_db_database }}?sslmode=disable
-Environment=DEFAULT_BASE_URL=https://{{ gpodder_subdomain }}.{{ domain }}
-Environment=SECRET_KEY={{ gpodder_secret }}
-Environment=MEDIA_ROOT=/data/gpodder
-Environment=DEBUG=False
-Environment=MAINTENANCE=False
-Environment=STAFF_TOKEN={{ gpodder_staff_token }}
-Environment=DEFAULT_FROM_EMAIL=noreply@{{ domain }}
-Environment=EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
-Environment=EMAIL_HOST={{ domain }}
-Environment=EMAIL_PORT=587
-Environment=EMAIL_HOST_USER=noreply@{{ domain }}
-Environment=EMAIL_HOST_PASSWORD={{ lookup('password', secret + '/' + 'mail_noreply_password length=20 chars=ascii_lowercase,ascii_uppercase,digits') }}
-Environment=EMAIL_USE_TLS=True
+WorkingDirectory=/home/gpodder
+ExecStart=bash -c './env.sh gunicorn mygpo.wsgi:application --bind=127.0.0.1:{{ gpodder_internal_port }} --workers=2 --access-logfile -'
+StandardOutput=append:/home/gpodder/gpodder_out.log
+StandardError=append:/home/gpodder/gpodder_err.log
 
 [Install]
 WantedBy=multi-user.target

roles/gpodder/templates/etc_systemd_system_gpodder_beat.j2

@@ -0,0 +1,18 @@
+[Unit]
+Description=Starts the gPodder heartbeat server
+Requires=network.target
+After=network.target
+After=syslog.target
+
+[Service]
+Type=simple
+User=gpodder
+Restart=always
+RestartSec=3
+WorkingDirectory=/home/gpodder
+ExecStart=bash -c './env.sh celery -A mygpo beat --pidfile /tmp/celerybeat.pid -S django'
+StandardOutput=append:/home/gpodder/gpodder_beat_out.log
+StandardError=append:/home/gpodder/gpodder_beat_err.log
+
+[Install]
+WantedBy=multi-user.target

roles/gpodder/templates/etc_systemd_system_gpodder_worker.j2

@@ -0,0 +1,18 @@
+[Unit]
+Description=Starts the gPodder worker server
+Requires=network.target
+After=network.target
+After=syslog.target
+
+[Service]
+Type=simple
+User=gpodder
+Restart=always
+RestartSec=3
+WorkingDirectory=/home/gpodder
+ExecStart=bash -c './env.sh celery -A mygpo worker --concurrency=3 -l info -Ofair'
+StandardOutput=append:/home/gpodder/gpodder_worker_out.log
+StandardError=append:/home/gpodder/gpodder_worker_err.log
+
+[Install]
+WantedBy=multi-user.target

roles/gpodder/templates/home_gpodder_env.j2

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+cd /home/gpodder/gpodder
+source venv/bin/activate
+
+export DATABASE_URL=postgres://{{ gpodder_db_username }}:{{ gpodder_db_password }}@localhost:5432/{{ gpodder_db_database }}?sslmode=disable
+export DEFAULT_BASE_URL=https://{{ gpodder_subdomain }}.{{ domain }}
+export SECRET_KEY={{ gpodder_secret }}
+export MEDIA_ROOT=/data/gpodder
+export DEBUG=False
+export MAINTENANCE=False
+export STAFF_TOKEN={{ gpodder_staff_token }}
+export DEFAULT_FROM_EMAIL=noreply@{{ domain }}
+export EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+export EMAIL_HOST={{ domain }}
+export EMAIL_PORT=587
+export EMAIL_HOST_USER=noreply@{{ domain }}
+export EMAIL_HOST_PASSWORD={{ lookup('password', secret + '/' + 'mail_noreply_password length=20 chars=ascii_lowercase,ascii_uppercase,digits') }}
+export EMAIL_USE_TLS=True
+export LOGGING_FILENAME=/home/gpodder/gpodder.log
+export LOGGING_DIR_GUNICRON=/home/gpodder/logs
+export SERVER_EMAIL=noreply@{{ domain }}
+export ADMINS="[('{{ main_user_name }}', '{{ main_user_name }}@{{ domain }}')]"
+export BROKER_URL=redis://localhost:6379/1
+export ACCOUNT_ACTIVATION_DAYS=7
+export ACTIVATION_VALID_DAYS=7
+
+"$@"

roles/monitoring/files/etc_monit_conf.d_gpodder

@@ -1,4 +1,4 @@
-check process gpodder matching "python manage.py runserver"
+check process gpodder matching "gunicorn mygpo.wsgi:application"
   group www
   start program = "/bin/systemctl start gpodder"
   stop program = "/bin/systemctl stop gpodder"
@@ -7,3 +7,15 @@ check process gpodder matching "python manage.py runserver"
     with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout
+
+check process gpodder_worker matching "celery -A mygpo worker"
+  group www
+  start program = "/bin/systemctl start gpodder_worker"
+  stop program = "/bin/systemctl stop gpodder_worker"
+  if 5 restarts within 5 cycles then timeout
+
+check process gpodder_beat with pidfile /tmp/celerybeat.pid
+  group www
+  start program = "/bin/systemctl start gpodder_beat"
+  stop program = "/bin/systemctl stop gpodder_beat"
+  if 5 restarts within 5 cycles then timeout