From df17dfd2c808c01ed21fb3a67f261c6e5134c0f5 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Tue, 21 Mar 2017 00:44:14 +0100 Subject: [PATCH] MAJ 0.7.1 --- conf/app.src | 4 ++-- conf/lutim.conf.template | 11 +++++++++++ manifest.json | 2 +- scripts/{.fonctions => _common.sh} | 7 +++++++ scripts/backup | 8 ++++---- scripts/install | 3 ++- scripts/remove | 2 +- scripts/restore | 8 ++++---- scripts/upgrade | 2 +- 9 files changed, 33 insertions(+), 14 deletions(-) rename scripts/{.fonctions => _common.sh} (98%) diff --git a/conf/app.src b/conf/app.src index 1317eb2..0b25ab5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,2 +1,2 @@ -SOURCE_URL>https://git.framasoft.org/luc/lutim/repository/archive.tar.gz?ref=1082f42682988453aef2a130ce99d3eae2e950ba -SOURCE_SUM=1a9a8dec0e418a87a32799b0b875813a +SOURCE_URL>https://framagit.org/luc/lutim/repository/archive.tar.gz?ref=dd4ca47ac0ea8e5527364ba9ebddfab0c977f3ea +SOURCE_SUM=64e86adf69cf63fcf025314a5ee5d30c diff --git a/conf/lutim.conf.template b/conf/lutim.conf.template index 2b6994d..4d7eed3 100644 --- a/conf/lutim.conf.template +++ b/conf/lutim.conf.template @@ -8,6 +8,9 @@ # array of IP addresses and ports you want to listen to #listen => ['http://127.0.0.1:8080'], listen => ['http://127.0.0.1:__PORT__'], + # if you use Lutim behind a reverse proxy like Nginx, you want to set proxy to 1 + # if you use Lutim directly, let it commented + proxy => 1, }, ################ @@ -110,6 +113,14 @@ # optional, default is lutim.db #db_path => 'lutim.db', + # define the height of the thumbnails generated at users' will + # this is not the height of the thumbnails send after upload, + # we're talking about thumbnails generated when someone asked for + # https://example.org/lutim/tesrinp?thumb + # this works only if you have ImageMagick + # optional, default is 100 (pixels) + #thumbnail_size => 100, + ########################## # Lutim cron jobs settings ########################## diff --git a/manifest.json b/manifest.json index c4d8516..c59934c 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Self hosting images and sharing anonymous application", "fr": "Application d'hébergement et de partage d'images anonyme" }, - "version": "0.6", + "version": "0.7.1", "url": "https://lut.im", "license": "AGPL-3.0", "maintainer": { diff --git a/scripts/.fonctions b/scripts/_common.sh similarity index 98% rename from scripts/.fonctions rename to scripts/_common.sh index 2243dd2..de90777 100755 --- a/scripts/.fonctions +++ b/scripts/_common.sh @@ -224,6 +224,13 @@ CHECK_MD5_CONFIG () { # Créé un backup du fichier de config si il a été modi fi } +#================================================= +# PACKAGE CHECK BYPASSING... +#================================================= + +IS_PACKAGE_CHECK () { # Détermine une exécution en conteneur (Non testé) + return $(uname -n | grep -c 'pchecker_lxc') +} #================================================= #================================================= diff --git a/scripts/backup b/scripts/backup index 248fe65..2298204 100644 --- a/scripts/backup +++ b/scripts/backup @@ -13,12 +13,12 @@ set -eu # IMPORT GENERIC HELPERS #================================================= -if [ ! -e .fonctions ]; then +if [ ! -e _common.sh ]; then # Rapatrie le fichier de fonctions si il n'est pas dans le dossier courant - sudo cp ../settings/scripts/.fonctions ./.fonctions - sudo chmod a+rx .fonctions + sudo cp ../settings/scripts/_common.sh ./_common.sh + sudo chmod a+rx _common.sh fi -source .fonctions +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index ffa973a..3b3b106 100644 --- a/scripts/install +++ b/scripts/install @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -source .fonctions +source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -159,6 +159,7 @@ sudo chown -R $app: $final_path sudo systemctl start lutim # Set right permissions on new files created at first start sudo chown -R $app: $final_path +sleep 2 #================================================= # GENERIC FINALISATION diff --git a/scripts/remove b/scripts/remove index 699e49b..af47c1a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -source .fonctions +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 2d4d694..21cb9ed 100644 --- a/scripts/restore +++ b/scripts/restore @@ -13,12 +13,12 @@ set -eu # IMPORT GENERIC HELPERS #================================================= -if [ ! -e .fonctions ]; then +if [ ! -e _common.sh ]; then # Rapatrie le fichier de fonctions si il n'est pas dans le dossier courant - sudo cp ../settings/scripts/.fonctions ./.fonctions - sudo chmod a+rx .fonctions + sudo cp ../settings/scripts/_common.sh ./_common.sh + sudo chmod a+rx _common.sh fi -source .fonctions +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4de2f1f..240a7d4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -source .fonctions +source _common.sh source /usr/share/yunohost/helpers #=================================================