website Changeset - 053504d099b8 · Conservancy Kallithea

Changeset - 053504d099b8

Parent rev.

Child rev.

[Not reviewed]

0 5 1

Ben Sturmfels (bsturmfels) - 8 months ago 2023-09-14 08:14:22
ben@sturm.com.au

Update "cleanup" and "update" services for Python 3

6 files changed with 32 insertions and 22 deletions:

README.md

systemd/README.md

systemd/conservancy-www-cleanup.service

systemd/conservancy-www-update.service

systemd/conservancy-www-update.sh

www/conservancy/settings.py

0 comments (0 inline, 0 general)

README.md

➞

Show inline comments

@@ ... / @@ -13,4 +13,3 @@ only.. @@
 License
 -------
 # License
@@ ... / @@ -25,16 +24,9 @@ The content and text (such as the HTML files) is currently @@
 Server configuration
 --------------------
 # Server configuration
 conservancy's webserver runs on a machine called aspen.sfconservancy.org, which
 is a standard Debian installation.
 Conservancy's webserver runs on a standard Debian installation. For
 configuration requirements, see `deploy/ansible/install.yml`.
 The following packages are installed to make Django and Apache work on a
 squeeze install:
     $ aptitude install python-django apache2 sqlite3 python3-sqlite libapache2-mod-wsgi-py3
 Django setup
 ------------
 # Django setup
@@ ... / @@ -45,4 +37,5 @@ Django setup @@
 Local development
 ---------
 # Local development
 Python dependencies are tied to the versions available in Debian.
@@ ... / @@ -52,4 +45,4 @@ Local development @@
 Deploying
 ---------
 # Deploying

systemd/README.md

➞

Show inline comments

 new file 100644
 Install with:
     cp systemd/conservancy-www-*.{service,timer} /etc/systemd/system
     systemctl enable conservancy-www-cleanup.service
     systemctl start conservancy-www-cleanup.service
     systemctl enable conservancy-www-update.timer
     systemctl start conservancy-www-update.timer
 Monitor with:
     systemctl list-timers --all
     journalctl --catalog --follow --unit conservancy-www-update.service
 Updates will fail unless `/var/www/website` has a git upstream, so set that with:
     git remote add upstream https://k.sfconservancy.org/website
     git branch --set-upstream-to=upstream/master master

systemd/conservancy-www-cleanup.service

➞

Show inline comments

@@ ... / @@ -6,4 +6,4 @@ Before=apache2.service @@
 Type=oneshot
 User=www
 ExecStart=/usr/bin/python /var/www/website/www/manage.py clearsessions --verbosity 0
 User=www-data
 ExecStart=/usr/bin/python3 /var/www/website/www/manage.py clearsessions --verbosity 0

systemd/conservancy-www-update.service

➞

Show inline comments

@@ ... / @@ -5,3 +5,3 @@ Description=Update Conservancy website checkout @@
 Type=oneshot
 User=www
+User=www-data
 WorkingDirectory=/var/www/website

systemd/conservancy-www-update.sh

➞

Show inline comments

@@ ... / @@ -32,3 +32,3 @@ exitcode=0 @@
 git merge --quiet --ff-only "$git_remote" "$git_refspec"
-python2 -m compileall -q -x - www || exitcode=$?
+python3 -m compileall -q -x - www || exitcode=$?
 chgrp -R www-data www || exitcode=$?

www/conservancy/settings.py

➞

Show inline comments

@@ ... @@
 if DEBUG:
-    ALLOWED_HOSTS.append('localhost')
+    ALLOWED_HOSTS = ['*']

0 comments (0 inline, 0 general)