almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-05-04 13:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fabfile: remove UMAP_SETTINGS in favor of /etc/umap/umap.conf

Browse source
This commit is contained in:
Yohan Boniface 2017-05-10 20:07:23 +02:00
parent fd7c0accf8
commit 5a11034a13
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fabfile/__init__.py
View file

@ -23,9 +23,7 @@ def as_user(ctx, user, cmd, *args, **kwargs):
def as_umap(ctx, cmd, *args, **kwargs): def as_umap(ctx, cmd, *args, **kwargs):
env = {'UMAP_SETTINGS': '/srv/umap/local.py'} as_user(ctx, 'umap', cmd)
env.update(ctx.config.get('env', {}))
as_user(ctx, 'umap', cmd, env=env)
def as_postgres(ctx, cmd, *args, **kwargs): def as_postgres(ctx, cmd, *args, **kwargs):
@ -65,14 +63,11 @@ def system(ctx):
'wget nginx uwsgi uwsgi-plugin-python3 postgresql-9.5 gcc ' 'wget nginx uwsgi uwsgi-plugin-python3 postgresql-9.5 gcc '
'postgresql-9.5-postgis-2.2 postgresql-server-dev-9.5') 'postgresql-9.5-postgis-2.2 postgresql-server-dev-9.5')
ctx.run('sudo mkdir -p /srv/umap') ctx.run('sudo mkdir -p /srv/umap')
ctx.run('sudo mkdir -p /etc/umap')
ctx.run('sudo useradd -N umap -d /srv/umap/ || exit 0') ctx.run('sudo useradd -N umap -d /srv/umap/ || exit 0')
ctx.run('sudo chown umap:users /srv/umap/') ctx.run('sudo chown umap:users /srv/umap/')
ctx.run('sudo chown umap:users /etc/umap/')
ctx.run('sudo chsh -s /bin/bash umap') ctx.run('sudo chsh -s /bin/bash umap')
# Allow UMAP_SETTINGS env var to be passed through ssh.
ctx.run('grep -q -r "^AcceptEnv UMAP_SETTINGS *" /etc/ssh/sshd_config '
'|| echo "AcceptEnv UMAP_SETTINGS *" '
'| sudo tee --append /etc/ssh/sshd_config')
ctx.run('sudo systemctl restart sshd')
@task @task
@ -92,7 +87,7 @@ def venv(ctx):
@task @task
def customize(ctx): def customize(ctx):
if ctx.custom.settings: if ctx.custom.settings:
sudo_put(ctx, ctx.custom.settings, '/srv/umap/local.py', sudo_put(ctx, ctx.custom.settings, '/etc/umap/umap.conf',
chown='umap:users') chown='umap:users')
if ctx.custom.static: if ctx.custom.static:
put_dir(ctx, ctx.custom.static, '/srv/umap/theme/static') put_dir(ctx, ctx.custom.static, '/srv/umap/theme/static')

2
fabfile/uwsgi.ini
View file

@ -8,8 +8,6 @@ chdir = /srv/umap/
module = umap.wsgi module = umap.wsgi
# the virtualenv (full path) # the virtualenv (full path)
home = /srv/umap/venv home = /srv/umap/venv
# the local settings path
env = UMAP_SETTINGS=/srv/umap/local.py
# Load env vars from /etc/default. # Load env vars from /etc/default.
# See http://uwsgi-docs.readthedocs.org/en/latest/ConfigLogic.html # See http://uwsgi-docs.readthedocs.org/en/latest/ConfigLogic.html