From d7d89b9db6d9b8d06753dbe40aee08ad79a1226c Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 22 Dec 2019 10:59:47 +0100 Subject: [PATCH] Update web2py and hackfix SAMBRO installation --- lxc-apps/sahana-demo/install/sahana_conf/000_config.py | 4 ++-- lxc-apps/sahana/install/sahana_conf/000_config.py | 4 ++-- lxc-apps/sahana/lxcfile | 5 +---- lxc-apps/sambro/install.sh | 3 ++- lxc-apps/sambro/install/sahana_conf/000_config.py | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lxc-apps/sahana-demo/install/sahana_conf/000_config.py b/lxc-apps/sahana-demo/install/sahana_conf/000_config.py index 0344a50..c606c2e 100644 --- a/lxc-apps/sahana-demo/install/sahana_conf/000_config.py +++ b/lxc-apps/sahana-demo/install/sahana_conf/000_config.py @@ -103,10 +103,10 @@ settings.mail.server = "host:25" #settings.mail.tls = True #settings.mail.login = "username:password" # From Address - until this is set, no mails can be sent -settings.mail.sender = "admin@example.com" +settings.mail.sender = "${SAHANADEMO_ADMIN_USER}" # Default email address to which requests to approve new user accounts gets sent # This can be overridden for specific domains/organisations via the auth_domain table -settings.mail.approver = "admin@example.com" +settings.mail.approver = "${SAHANADEMO_ADMIN_USER}" # Daily Limit on Sending of emails #settings.mail.limit = 1000 diff --git a/lxc-apps/sahana/install/sahana_conf/000_config.py b/lxc-apps/sahana/install/sahana_conf/000_config.py index 943356d..c17fbc7 100644 --- a/lxc-apps/sahana/install/sahana_conf/000_config.py +++ b/lxc-apps/sahana/install/sahana_conf/000_config.py @@ -103,10 +103,10 @@ settings.mail.server = "host:25" #settings.mail.tls = True #settings.mail.login = "username:password" # From Address - until this is set, no mails can be sent -settings.mail.sender = "admin@example.com" +settings.mail.sender = "${SAHANA_ADMIN_USER}" # Default email address to which requests to approve new user accounts gets sent # This can be overridden for specific domains/organisations via the auth_domain table -settings.mail.approver = "admin@example.com" +settings.mail.approver = "${SAHANA_ADMIN_USER}" # Daily Limit on Sending of emails #settings.mail.limit = 1000 diff --git a/lxc-apps/sahana/lxcfile b/lxc-apps/sahana/lxcfile index e7c17a4..0233d50 100644 --- a/lxc-apps/sahana/lxcfile +++ b/lxc-apps/sahana/lxcfile @@ -13,12 +13,9 @@ RUN EOF # Install web2py git clone --recursive https://github.com/web2py/web2py.git /srv/web2py - git -C /srv/web2py checkout 6128d03 + git -C /srv/web2py checkout 59700b8 git -C /srv/web2py submodule update - # Fix Web2py urllib import (https://github.com/web2py/pydal/commit/9d2290c) - sed -i 's/import traceback/import traceback\nimport urllib/' /srv/web2py/gluon/packages/dal/pydal/base.py - # Symlink WSGI handler ln -s /srv/web2py/handlers/wsgihandler.py /srv/web2py/wsgihandler.py diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh index 4b3e111..332ac36 100755 --- a/lxc-apps/sambro/install.sh +++ b/lxc-apps/sambro/install.sh @@ -18,7 +18,6 @@ envsubst /srv/sambro/sahana_conf/000_config.py #chown -R 8080:8080 /var/lib/lxc/sambro/sambro/srv/web2py cp sahana_conf/00_settings.py /srv/sambro/sahana_conf/00_settings.py cp sahana_data/SAMBRO/config.py /srv/sambro/sahana_data/SAMBRO/config.py +# Hackfix for https://github.com/sahana/eden/issues/1530 +echo 'CANARY_UPDATE_CHECK_ID = 4' >/srv/sambro/sahana_conf/0000_update_check.py chown -R 108080:108080 /srv/sambro/sahana_conf /srv/sambro/sahana_data # Populate database diff --git a/lxc-apps/sambro/install/sahana_conf/000_config.py b/lxc-apps/sambro/install/sahana_conf/000_config.py index 510916d..5ce480c 100644 --- a/lxc-apps/sambro/install/sahana_conf/000_config.py +++ b/lxc-apps/sambro/install/sahana_conf/000_config.py @@ -103,10 +103,10 @@ settings.mail.server = "host:25" #settings.mail.tls = True #settings.mail.login = "username:password" # From Address - until this is set, no mails can be sent -settings.mail.sender = "admin@example.com" +settings.mail.sender = "${SAMBRO_ADMIN_USER}" # Default email address to which requests to approve new user accounts gets sent # This can be overridden for specific domains/organisations via the auth_domain table -settings.mail.approver = "admin@example.com" +settings.mail.approver = "${SAMBRO_ADMIN_USER}" # Daily Limit on Sending of emails #settings.mail.limit = 1000