From 05053c183604f29463377e2be7b2daeb055f21ce Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Mar 2020 17:40:13 +0200 Subject: [PATCH] Upgrade to 191218 --- conf/app.src | 6 +++--- manifest.json | 2 +- scripts/ynh_install_php__3 | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/conf/app.src b/conf/app.src index b59879d..b6df581 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://framagit.org/ljf/framaforms/-/archive/19ef353c7d88813d9c404e965b3f86bc8905d06d/framaforms-19ef353c7d88813d9c404e965b3f86bc8905d06d.tar.gz -SOURCE_SUM=7df7a449a36bb60059b5642cfd86b44422e0bd8bdc182ba71621d90c74bc0967 +SOURCE_URL=https://framagit.org/framasoft/framaforms/-/archive/v0.1/framaforms-v0.1.tar.gz +SOURCE_SUM=7320414b95992f33a8ea1ea8504ed95fb06a637e03118fadf8ed20a121f09f76 SOURCE_SUM_PRG=sha256sum -SOURCE_FILENAME=framaforms-1.0.0+190618.tar.gz +SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 6cfdcd8..1212dfc 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Framaforms helps you create online webforms and surveys" }, - "version": "1.0.0+190618-ynh6", + "version": "1.0.0+191218-ynh1", "url": "https://framagit.org/framasoft/framaforms", "license": "GPL-2.0-only", "requirements": { diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index 75bb6db..8d8323a 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -37,10 +37,11 @@ ynh_install_php () { # Set php7.0 back as the default version for php-cli. update-alternatives --set php /usr/bin/php7.0 - # Remove this extra repository after packages are installed - ynh_remove_extra_repo --name=extra_php_version + # Pin this extra repository after packages are installed to prevent sury of doing shit + ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version --append - # Advertise service in admin panel + # INTEGRATE SERVICE IN YUNOHOST yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" }