Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update for Debian 12

Browse source
This commit is contained in:
Ben Sturmfels 2023-09-15 22:46:16 +10:00
parent 503b9b164e
commit e9ab231173
Signed by: bsturmfels
GPG key ID: 023C05E2C9C068F0
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deploy/basics.yml
View file

@ -13,6 +13,7 @@
ansible.builtin.command: ansible.builtin.command:
cmd: openssl dhparam -out /etc/nginx/dhparam.pem 2048 cmd: openssl dhparam -out /etc/nginx/dhparam.pem 2048
creates: /etc/nginx/dhparam.pem creates: /etc/nginx/dhparam.pem
- name: Install fail2ban - name: Install fail2ban
apt: apt:
pkg: fail2ban pkg: fail2ban
@ -120,7 +121,7 @@
# dest: /etc/postfix/sasl_passwd # dest: /etc/postfix/sasl_passwd
# content: |- # content: |-
# # After updating, run `sudo postmap hash:/etc/postfix/sasl_passwd`. # # After updating, run `sudo postmap hash:/etc/postfix/sasl_passwd`.
# [pine.sfconservancy.org]:587 conference@sfconservancy.org:PASSWORD # [mail.sfconservancy.org]:587 conference@sfconservancy.org:PASSWORD
- name: Configure Postfix envelope rewriting - name: Configure Postfix envelope rewriting
copy: copy:

5
deploy/postfix/main.cf
View file

@ -36,8 +36,8 @@ myhostname = symposion.sfconservancy.org
alias_maps = hash:/etc/aliases alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases alias_database = hash:/etc/aliases
myorigin = /etc/mailname myorigin = /etc/mailname
mydestination = $myhostname, symposion.novalocal, symposion, localhost mydestination = $myhostname, symposion, localhost
relayhost = [pine.sfconservancy.org]:587 relayhost = [mail.sfconservancy.org]:587
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
mailbox_size_limit = 0 mailbox_size_limit = 0
recipient_delimiter = + recipient_delimiter = +
@ -50,7 +50,6 @@ smtp_sasl_auth_enable = yes
smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
smtp_sasl_security_options = noanonymous smtp_sasl_security_options = noanonymous
smtp_tls_security_level = secure smtp_tls_security_level = secure
smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
# Increase default limit of 10M to 50M # Increase default limit of 10M to 50M
message_size_limit = 51200000 message_size_limit = 51200000

7
fabfile.py vendored
View file

@ -11,7 +11,6 @@ import os
from fabric import task # type: ignore from fabric import task # type: ignore
from invoke.collection import Collection # type: ignore from invoke.collection import Collection # type: ignore
from patchwork.files import exists
from vps_deploy import django_fabric2 as df2 # type: ignore from vps_deploy import django_fabric2 as df2 # type: ignore
hosts = os.environ['FABRIC_HOSTS'].split(',') hosts = os.environ['FABRIC_HOSTS'].split(',')
@ -27,7 +26,7 @@ def deploy(c):
install_essentials(c) install_essentials(c)
df2.transfer_files_git(c) df2.transfer_files_git(c)
df2.init(c) df2.init(c)
if not exists(c, c.env.virtualenv): if not c.run(f'test -e {c.env.virtualenv}', warn=True):
c.sudo(f'mkdir -p $(dirname {c.env.virtualenv})') c.sudo(f'mkdir -p $(dirname {c.env.virtualenv})')
c.sudo(f'chown {c.user} $(dirname {c.env.virtualenv})') c.sudo(f'chown {c.user} $(dirname {c.env.virtualenv})')
c.run('{env.python} -m venv --system-site-packages {env.virtualenv}'.format(env=c.env)) c.run('{env.python} -m venv --system-site-packages {env.virtualenv}'.format(env=c.env))
@ -81,13 +80,13 @@ ns.configure({
'db_name': 'symposion', 'db_name': 'symposion',
'project_dir': '/srv/symposion_app', 'project_dir': '/srv/symposion_app',
'media_dir': 'media', 'media_dir': 'media',
'virtualenv': '/srv/venvs/symposion-django-py39', 'virtualenv': '/srv/venvs/symposion-django-cp311',
'site_name': 'symposion', 'site_name': 'symposion',
'requirements': 'requirements.txt', 'requirements': 'requirements.txt',
'settings': 'pinaxcon.settings', 'settings': 'pinaxcon.settings',
'uwsgi_conf': 'deploy/uwsgi.ini', 'uwsgi_conf': 'deploy/uwsgi.ini',
'nginx_conf': 'deploy/nginx.conf', 'nginx_conf': 'deploy/nginx.conf',
'python': '/usr/bin/python3.9', 'python': '/usr/bin/python3.11',
'url': 'https://2023.fossy.us/', 'url': 'https://2023.fossy.us/',
'domain': '2023.fossy.us', 'domain': '2023.fossy.us',
}, },

2
requirements.txt
View file

@ -4,7 +4,7 @@ pinax-eventlog[django-lts]==5.1.0
django-formset-js==0.5.0 django-formset-js==0.5.0
whitenoise==5.2.0 whitenoise==5.2.0
dj-database-url==0.5.0 dj-database-url==0.5.0
pylibmc==1.6.1 pylibmc==1.6.3
django-debug-toolbar==3.1.1 django-debug-toolbar==3.1.1
django-bootstrap-form==3.4 django-bootstrap-form==3.4
django-settings-export~=1.2.1 django-settings-export~=1.2.1