diff --git a/conf/app.src b/conf/app.src index ca8a4e4..4da06e6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://codeberg.org/zot/zap/archive/078714b9dde991d02f8cce1183ce357d96405558.tar.gz +SOURCE_URL=https://codeberg.org/zot-archive/zap/archive/078714b9dde991d02f8cce1183ce357d96405558.tar.gz SOURCE_SUM=6159da945fe504bffe23f80d299bfe3e146a9d9df76412f5bea6d1d415516d34 SOURCE_FORMAT=tar.gz diff --git a/conf/app_addons.src b/conf/app_addons.src index 5c526c5..1ea3fd7 100644 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://codeberg.org/zot/zap-addons/archive/b2ddcc67735fb413f14efcc9c49780469b8b61cf.tar.gz +SOURCE_URL=https://codeberg.org/zot-archive/zap-addons/archive/b2ddcc67735fb413f14efcc9c49780469b8b61cf.tar.gz SOURCE_SUM=009f5047096fdbe3becaebfb7ac3ee34d7efd3f4f891e3a645484a7e406598a1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index a2e6806..69d8860 100644 --- a/manifest.json +++ b/manifest.json @@ -18,12 +18,12 @@ "name": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.4-fpm", "mysql", "postgresql" ], diff --git a/scripts/_common.sh b/scripts/_common.sh index c654c01..c630efa 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="postgresql postgresql-contrib php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd" diff --git a/scripts/install b/scripts/install index 114ece7..68b0f3c 100755 --- a/scripts/install +++ b/scripts/install @@ -83,8 +83,7 @@ ynh_script_progression --message="Setting up Zap source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -git clone https://codeberg.org/zot/zap.git "$final_path" --quiet - +git clone https://codeberg.org/zot-archive/zap.git "$final_path" --quiet # 2 - Zap Addons @@ -94,7 +93,7 @@ ynh_script_progression --message="Setting up Zap addons source files..." pushd "$final_path" mkdir -p extend/addon/zaddons mkdir addon - git clone https://codeberg.org/zot/zap-addons.git $final_path/extend/addon/zaddons --quiet + git clone https://codeberg.org/zot-archive/zap-addons.git $final_path/extend/addon/zaddons --quiet filelist=(`ls extend/addon/zaddons`) cd addon for a in "${filelist[@]}" ; do