Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Update web2py and hackfix SAMBRO installation

Browse Source
This commit is contained in:
Disassembler 2019-12-22 10:59:47 +01:00
parent 44209ddfb3
commit d7d89b9db6
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lxc-apps/sahana-demo/install/sahana_conf/000_config.py
View File

@ -103,10 +103,10 @@ settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
#settings.mail.login = "username:password" #settings.mail.login = "username:password"
# From Address - until this is set, no mails can be sent # 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 # 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 # 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 # Daily Limit on Sending of emails
#settings.mail.limit = 1000 #settings.mail.limit = 1000

4
lxc-apps/sahana/install/sahana_conf/000_config.py
View File

@ -103,10 +103,10 @@ settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
#settings.mail.login = "username:password" #settings.mail.login = "username:password"
# From Address - until this is set, no mails can be sent # 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 # 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 # 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 # Daily Limit on Sending of emails
#settings.mail.limit = 1000 #settings.mail.limit = 1000

5
lxc-apps/sahana/lxcfile
View File

@ -13,12 +13,9 @@ RUN EOF
# Install web2py # Install web2py
git clone --recursive https://github.com/web2py/web2py.git /srv/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 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 # Symlink WSGI handler
ln -s /srv/web2py/handlers/wsgihandler.py /srv/web2py/wsgihandler.py ln -s /srv/web2py/handlers/wsgihandler.py /srv/web2py/wsgihandler.py

3
lxc-apps/sambro/install.sh
View File

@ -18,7 +18,6 @@ envsubst <createdb.sql | lxc-attach -u 5432 -g 5432 sambro-postgres -- psql
# Prepare persistent directory structure # Prepare persistent directory structure
mkdir -p /srv/sambro/sahana_data/databases /srv/sambro/sahana_data/uploads mkdir -p /srv/sambro/sahana_data/databases /srv/sambro/sahana_data/uploads
chown -R 108080:108080 /srv/sambro/sahana_data
lxchelper extract sambro /srv/web2py/applications/eden/models /srv/sambro/sahana_conf lxchelper extract sambro /srv/web2py/applications/eden/models /srv/sambro/sahana_conf
lxchelper extract sambro /srv/web2py/applications/eden/modules/templates/SAMBRO /srv/sambro/sahana_data/SAMBRO lxchelper extract sambro /srv/web2py/applications/eden/modules/templates/SAMBRO /srv/sambro/sahana_data/SAMBRO
@ -33,6 +32,8 @@ envsubst <sahana_conf/000_config.py >/srv/sambro/sahana_conf/000_config.py
#chown -R 8080:8080 /var/lib/lxc/sambro/sambro/srv/web2py #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_conf/00_settings.py /srv/sambro/sahana_conf/00_settings.py
cp sahana_data/SAMBRO/config.py /srv/sambro/sahana_data/SAMBRO/config.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 chown -R 108080:108080 /srv/sambro/sahana_conf /srv/sambro/sahana_data
# Populate database # Populate database

4
lxc-apps/sambro/install/sahana_conf/000_config.py
View File

@ -103,10 +103,10 @@ settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
#settings.mail.login = "username:password" #settings.mail.login = "username:password"
# From Address - until this is set, no mails can be sent # 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 # 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 # 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 # Daily Limit on Sending of emails
#settings.mail.limit = 1000 #settings.mail.limit = 1000