reordered sleep. updated deployment files

backend.py

@@ -31,16 +31,17 @@ if __name__ == '__main__':
         while True:
             for user in db.active_users:
                 for bot in bots:
+                    sleep(0.5)
                     reports = bot.crawl(user)
                     for status in reports:
+                        sleep(0.5)
                         if not user.is_appropriate(status):
                             logger.info("Inaproppriate message: %d %s %s" % (user.uid, status.author, status.text))
                             continue
                         for bot2 in bots:
+                            sleep(0.5)
                             bot2.post(user, status)
                             logger.info("Resent: %d %s %s" % (user.uid, status.author, status.text))
-                            sleep(0.5)
-                    sleep(0.5)
     except Exception:
         logger.error("Shutdown.", exc_info=True)
         shutdown()

deployment/backend_daemon

@@ -0,0 +1,15 @@
+#!/bin/ksh
+
+daemon="/usr/local/bin/python3 /srv/ticketfrei/backend.py"
+daemon_user="root"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_start() {
+        ${rcexec} "cd /srv/ticketfrei; nice -n15 ${daemon} ${daemon_flags}"
+}
+
+rc_cmd $1

deployment/backup.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-# This is a script to backup the necessary components for a deployment with
-# nginx and uwsgi with borgbackup.
-
-# stop the services
-service ticketfrei-web stop
-service ticketfrei-backend stop
-
-# export repository passphrase
-export BORG_PASSPHRASE='password'
-
-# create backup
-borg create --stats --progress backup:repositories-borg/ticketfrei::'backup{now:%Y%m%d}' /etc/aliases /var/ticketfrei/db.sqlite /srv/ticketfrei/config.toml
-
-# restart the service
-service ticketfrei-backend start
-service ticketfrei-web start
-
-# prune outdated backups to save storage
-borg prune --keep-daily=7 --keep-weekly=4 backup:repositories-borg/ticketfrei
-

deployment/borgbackup.sh

@@ -0,0 +1,15 @@
+#!/bin/ksh
+. /etc/borg-env
+export BORG_REPO=nathan@nephilim:repositories-borg/ticketfrei
+export BORG_RSH="ssh \
+-o TCPKeepAlive=no \
+-o ServerAliveInterval=15 \
+-o ServerAliveCountMax=10 \
+-o Compression=no"
+
+rcctl stop backend_daemon
+rcctl stop frontend_daemon
+/usr/local/bin/borg create --stats ::'backup{now:%Y%m%d-%H%M}' /srv/ticketfrei /var/ticketfrei /etc
+rcctl start backend_daemon
+rcctl start frontend_daemon
+

deployment/example.org.conf

@@ -1,31 +0,0 @@
-server {
-
-    listen 443 ssl;
-    server_name example.org;
-    ssl_certificate /etc/letsencrypt/live/example.org/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/example.org/privkey.pem;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers         HIGH:!aNULL:!MD5;
-
-    access_log /var/log/nginx/example.org_access.log;
-    error_log /var/log/nginx/example.org_error.log;
-
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-
-    location / {
-        include uwsgi_params;
-
-        uwsgi_pass unix:///var/run/ticketfrei/ticketfrei.sock;
-    }
-
-    location /.well-known/acme-challenge {
-        root /var/www/acme;
-    }
-}
-server {
-    listen 80;
-    listen [::]:80;
-    server_name example.org;
-    return 301 https://$server_name$request_uri;
-}
-

deployment/frontend_daemon

@@ -0,0 +1,15 @@
+#!/bin/ksh
+
+daemon="/usr/local/bin/python3 /srv/ticketfrei/frontend.py"
+daemon_user="frontend"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_start() {
+        ${rcexec} "env > /tmp/envars; cd /srv/ticketfrei; ${daemon} ${daemon_flags}"
+}
+
+rc_cmd $1

deployment/ticketfrei-backend.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Ticketfrei Backend
-After=syslog.target network.target
-
-[Service]
-WorkingDirectory=/srv/ticketfrei
-ExecStart=/srv/ticketfrei/bin/python3 backend.py
-# Requires systemd version 211 or newer
-#RuntimeDirectory=uwsgi
-Restart=always
-KillSignal=SIGQUIT
-Type=simple
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target

deployment/ticketfrei-web.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Ticketfrei Web Application
-After=syslog.target network.target
-
-[Service]
-WorkingDirectory=/srv/ticketfrei
-ExecStart=/usr/bin/uwsgi --ini /srv/ticketfrei/deployment/uwsgi.ini
-# Requires systemd version 211 or newer
-RuntimeDirectory=uwsgi
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-User=tech
-Group=www-data
-
-[Install]
-WantedBy=multi-user.target

ticketfrei-backend.service

@@ -1,20 +0,0 @@
-[Unit]
-Description=Ticketfrei Backend
-After=syslog.target network.target
-StartLimitIntervalSec=300
-StartLimitBurst=3
-
-[Service]
-WorkingDirectory=/srv/ticketfrei
-ExecStart=/srv/ticketfrei/bin/python3 backend.py
-# Requires systemd version 211 or newer
-#RuntimeDirectory=uwsgi
-Restart=always
-RestartSec=60
-KillSignal=SIGQUIT
-Type=simple
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target