From cc47c58e222dd8bc24c6e074ea9f2491a7a653bb Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 23 Aug 2019 17:43:40 +0200 Subject: [PATCH] Misc fixes for the install to work ... though still WIP --- conf/app.src | 6 +++--- conf/local.py.j2 | 12 ++++++------ scripts/install | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7b9885e..6eecabd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.ffdn.org/FFDN/coin/archive/571df323feac6cb8fb338a8341bbd8c329f0d238.tar.gz -SOURCE_FILENAME=coin-2018-08-17-2.tar.gz +SOURCE_URL=https://code.ffdn.org/ffdn/coin/-/archive/ce7740fbb1c790eb4e7fe8795256685f3275ca6a/archive.tar.gz +SOURCE_FILENAME=coin-ce7740fbb1c790eb4e7fe8795256685f3275ca6a.tar.gz SOURCE_FORMAT=tar.gz -SOURCE_SUM=09026019017592ea178e19a54443dbe928d191c13d7bb030c50e9e267988bf98 +SOURCE_SUM=db1dcc3a5df2bdabe0e59d0712a49d5d3ef85cb4491b605bc3614a84f4376f18 SOURCE_SUM_PRG=sha256sum diff --git a/conf/local.py.j2 b/conf/local.py.j2 index ca1d3fc..125caa7 100644 --- a/conf/local.py.j2 +++ b/conf/local.py.j2 @@ -28,8 +28,8 @@ DATABASES = { 'NAME': '{{ db_name }}', 'USER': '{{ db_user }}', 'PASSWORD': '{{ db_pwd }}', - 'HOST': '', # Empty for localhost through domain sockets - 'PORT': '', # Empty for default + 'HOST': '127.0.0.1', + 'PORT': '5432', }, } @@ -55,12 +55,12 @@ FEEDS = (('ffdn', 'http://www.ffdn.org/fr/rss.xml', 3)) -# Tous accés -# paramétrer SSO en protect_uris +# Tous acces +# parametrer SSO en protect_uris # OU -# Pas d'accès +# Pas d'acces # hook -# paramétrer SSO en protect_uris +# parametrer SSO en protect_uris import ldap from django_auth_ldap.config import LDAPSearch, PosixGroupType AUTHENTICATION_BACKENDS = ( diff --git a/scripts/install b/scripts/install index 8b0de71..f193c82 100644 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ virtualenv "$final_path/venv" # CONFIGURATION DJANGO #================================================= -export prefix="${path#"/"}/" +export prefix="${path_url#"/"}/" prefix=${prefix%"/"} ynh_render_template ../conf/local.py.j2 "$final_path/app/setings_local.py" ynh_store_file_checksum --file="$final_path/app/settings_local.py"