diff --git a/README.md b/README.md index 42175bb..288fb5d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview LibrePhotos is a Google Photos-like app. It supports automatic classification of faces, grouping photos by date, location, or objects present, and album creation. -**Shipped version:** 2020-04-22 +**Shipped version:** 2020-05-03 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 96bd6a6..25b12e1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble LibrePhotos est un sercice inspiré par Google Photos. Il prend en charge la classification des visages, le groupement des photos par date, la localisation géographique, ou objets présents, et la création d'albums. -**Version incluse :** 2020-04-13 +**Version incluse :** 2020-05-03 ## Captures d'écran diff --git a/conf/backend.src b/conf/backend.src index f0bb14a..516f84e 100644 --- a/conf/backend.src +++ b/conf/backend.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/LibrePhotos/librephotos/tarball/88c29c910fddcf0f8a3c88c8538460a8fcc15aa4 -SOURCE_SUM=c1a2bd55fd7bbf48eef7cafefcca0af33d8a07763bf764322f29f74227d68391 +SOURCE_URL=https://github.com/LibrePhotos/librephotos/tarball/e73c44cc118b3f61459700883d2d1b71308b8ea0 +SOURCE_SUM=d1cf8f6637e46edf1eb1938ffda29953a847d0168289766ef795fa814aaa9c3e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=88c29c910fddcf0f8a3c88c8538460a8fcc15aa4 +SOURCE_FILENAME=e73c44cc118b3f61459700883d2d1b71308b8ea0 SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 12e99a1..c9839cf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A photo viewer and manager similar to Google Photos", "fr": "Un gestionnaire de photos semblable à Google Photos" }, - "version": "0.0.20210422~ynh1", + "version": "0.0.20210503~ynh1", "url": "https://github.com/LibrePhotos/librephotos", "license": "MIT", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index d7b1583..7bf5164 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -114,6 +114,13 @@ function set_permissions { setfacl -n -R -m user:www-data:rx -m default:user:www-data:rx $data_path/protected_media $data_path/data $data_path/data/nextcloud_media } +function set_up_logrotate { + ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" --non_append + ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" + ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" + ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 1f2824d..4ba6ebb 100755 --- a/scripts/install +++ b/scripts/install @@ -198,10 +198,7 @@ set_permissions ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfiles -ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" +set_up_logrotate #================================================= # INTEGRATE SERVICES IN YUNOHOST diff --git a/scripts/upgrade b/scripts/upgrade index 9e57bde..f31f815 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -167,10 +167,7 @@ set_permissions ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 # Use logrotate to manage application logfiles -ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" --non-append +set_up_logrotate #================================================= # INTEGRATE SERVICES IN YUNOHOST diff --git a/sources/patches/backend-00-settings.py.patch b/sources/patches/backend-00-settings.py.patch index a21d156..d5ef33c 100644 --- a/sources/patches/backend-00-settings.py.patch +++ b/sources/patches/backend-00-settings.py.patch @@ -1,5 +1,5 @@ diff --git a/ownphotos/settings.py b/ownphotos/settings.py -index 81966c8..296df86 100644 +index 3449af1..f1a6be7 100644 --- a/ownphotos/settings.py +++ b/ownphotos/settings.py @@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ @@ -10,7 +10,7 @@ index 81966c8..296df86 100644 for envvar in ( 'SECRET_KEY', -@@ -75,7 +76,7 @@ CONSTANCE_CONFIG = { +@@ -76,7 +77,7 @@ CONSTANCE_CONFIG = { 'IMAGE_DIRS': ("/data", 'Image dirs list (serialized json)', str) } @@ -19,7 +19,7 @@ index 81966c8..296df86 100644 CORS_ALLOW_HEADERS = ( 'cache-control', -@@ -92,10 +93,11 @@ CORS_ALLOW_HEADERS = ( +@@ -93,10 +94,11 @@ CORS_ALLOW_HEADERS = ( 'x-requested-with', ) @@ -35,7 +35,7 @@ index 81966c8..296df86 100644 REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': ( -@@ -229,7 +231,7 @@ AUTH_PASSWORD_VALIDATORS = [ +@@ -231,7 +233,7 @@ AUTH_PASSWORD_VALIDATORS = [ LANGUAGE_CODE = 'en-us' @@ -44,7 +44,7 @@ index 81966c8..296df86 100644 USE_I18N = True -@@ -265,8 +267,8 @@ FULLPHOTO_SIZE = (1000, 1000) +@@ -267,8 +269,8 @@ FULLPHOTO_SIZE = (1000, 1000) CORS_ORIGIN_ALLOW_ALL = False CORS_ALLOW_CREDENTIALS = True @@ -55,7 +55,7 @@ index 81966c8..296df86 100644 #Must be less or egal of nb core CPU ( Nearly 2GB per process) HEAVYWEIGHT_PROCESS_ENV = os.environ.get('HEAVYWEIGHT_PROCESS', '1') -@@ -287,3 +289,12 @@ LOGGING = { +@@ -289,3 +291,12 @@ LOGGING = { }, }, }