chore: update sample systemd units

examples/systemd/README.md

@@ -6,7 +6,7 @@ Mnemosyne has been deployed a systemd services running a user session.
 
 The web application runs with puma and systemd socket activation.
 
-```
+```plain
 puma.socket
 puma.service
 ```
@@ -15,7 +15,7 @@ puma.service
 
 Consumers are started via a systemd target to allow simple sharing.
 
-```
+```plain
 [email protected]
 hutch.target
 ```
@@ -24,22 +24,22 @@ hutch.target
 
 Create more services by enabling and starting service instances:
 
-```
-systemctl --user enable hutch@{1,2,3,4}.service
-systemctl --user start hutch@{1,2,3,4}.service
+```plain
+systemctl --user enable hutch@{1,2}.service
+systemctl --user start hutch@{1,2}.service
 ```
 
 All services can be managed via the target, e.g.:
 
-```
+```plain
 systemctl --user restart hutch.target
 ```
 
 ## Cleanup
 
 The cleanup task is regularly run via a systemd timer and service.
 
-```
+```plain
 mnemosyne-clean.timer
 mnemosyne-clean.service
 ```

examples/systemd/hutch@.service

@@ -6,10 +6,19 @@ PartOf=hutch.target
 
 [Service]
 Type=simple
+
+# Specify the path to your puma application root
 Environment=RAILS_ENV=production
+Environment=LOG_LEVEL=info
+Environment=MALLOC_ARENA_MAX=2
+Environment=JOB_INDEX=%i
+EnvironmentFile=/home/mnemosyne/.config/default/mnemosyne
 WorkingDirectory=/home/mnemosyne/application/current
-ExecStart=/usr/bin/bundle exec rake mnemosyne:consume
+ExecStart=/home/mnemosyne/application/current/bin/rake mnemosyne:consume
 Restart=always
+RestartSec=120
+RuntimeMaxSec=24h
+StandardOutput=null
 
 [Install]
 WantedBy=hutch.target

examples/systemd/mnemosyne-clean.service

@@ -3,9 +3,15 @@ Description=Mnemosyne cleanup task
 
 [Service]
 Type=simple
+
 Environment=RAILS_ENV=production
+Environment=MALLOC_ARENA_MAX=2
+EnvironmentFile=/home/mnemosyne/.config/default/mnemosyne
+
 WorkingDirectory=/home/mnemosyne/application/current
+
 ExecStart=/home/mnemosyne/application/current/bin/rake mnemosyne:clean
+
 Restart=on-failure
 RestartSec=60s
 

examples/systemd/mnemosyne-clean.timer

@@ -4,6 +4,7 @@ Description=Run menmosyne clean up task removing data according to retention pol
 [Timer]
 OnCalendar=*-*-* 00:00:00
 Unit=mnemosyne-clean.service
+RandomizedDelaySec=2h
 
 [Install]
 WantedBy=timers.target

examples/systemd/puma.service

@@ -2,14 +2,24 @@
 Description=Puma HTTP Server
 After=network.target
 Requires=puma.socket
+Conflicts=unicorn.service
 
 [Service]
 Type=simple
+
+Environment=LISTEN=unix:///tmp/mnemosyne/web.sock
+Environment=MALLOC_ARENA_MAX=2
 Environment=RAILS_ENV=production
 Environment=RAILS_MAX_THREADS=32
+Environment=WEB_CONCURRENCY=4
+EnvironmentFile=/home/mnemosyne/.config/default/mnemosyne
+
 WorkingDirectory=/home/mnemosyne/application/current
-ExecStart=/home/mnemosyne/application/current/bin/puma -C config/puma.rb -w 3 -t 8:32 -b unix:///tmp/mnemosyne/puma.socket
-Restart=always
+
+ExecStart=/home/mnemosyne/application/current/bin/puma -C config/puma.rb -b ${LISTEN}
+
+Restart=on-failure
+RestartSec=10s
 
 [Install]
 WantedBy=default.target

examples/systemd/puma.socket

@@ -1,8 +1,9 @@
 [Unit]
 Description=Puma Socket
+Conflicts=unicorn.socket
 
 [Socket]
-ListenStream=/tmp/mnemosyne/puma.socket
+ListenStream=/tmp/mnemosyne/web.sock
 
 NoDelay=true
 ReusePort=true

examples/systemd/unicorn.service

@@ -0,0 +1,27 @@
+[Unit]
+Description=Unicorn HTTP Server
+After=network.target
+Requires=unicorn.socket
+Conflicts=puma.service
+
+[Service]
+Type=simple
+
+Environment=LISTEN=/tmp/mnemosyne/web.sock
+Environment=MALLOC_ARENA_MAX=2
+Environment=RAILS_ENV=production
+Environment=RAILS_MAX_THREADS=1
+Environment=WORKER=8
+EnvironmentFile=/home/mnemosyne/.config/default/mnemosyne
+
+WorkingDirectory=/home/mnemosyne/application/current/
+
+ExecStart=/home/mnemosyne/application/current/bin/unicorn --config-file config/unicorn.rb --listen ${LISTEN}
+ExecReload=/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+
+Restart=on-failure
+RestartSec=10s
+
+[Install]
+WantedBy=default.target

examples/systemd/unicorn.socket

@@ -0,0 +1,13 @@
+[Unit]
+Description=Unicorn Socket
+Conflicts=puma.socket
+
+[Socket]
+ListenStream=/tmp/mnemosyne/web.sock
+
+NoDelay=true
+ReusePort=true
+Backlog=1024
+
+[Install]
+WantedBy=sockets.target