YunoHost-Apps/streams_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/streams_ynh.git synced 2024-09-03 20:26:20 +02:00
Code Issues Activity Actions

Merge pull request #28 from YunoHost-Apps/4.3

Browse source 
4.3
This commit is contained in:
Alexandre Aubin 2021-11-30 18:26:07 +01:00 • committed by GitHub
commit 6dea3d1870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -30,7 +30,7 @@ Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzil
- **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. - **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection.
**Shipped version:** 21.10.21~ynh1 **Shipped version:** 21.11.28~ynh1

2
README_fr.md
View file

@ -26,7 +26,7 @@ Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzil
- **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. - **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection.
**Version incluse :** 21.10.21~ynh1 **Version incluse :** 21.11.28~ynh1

7
conf/app.src
View file

@ -1,6 +1,3 @@
SOURCE_URL=https://codeberg.org/zot/zap/archive/8f08b200fd6c410c88a3f24248da55185721ccf1.tar.gz SOURCE_URL=https://codeberg.org/zot/zap/archive/078714b9dde991d02f8cce1183ce357d96405558.tar.gz
SOURCE_SUM=82eab96306b2c4fb1d2dfcded5ccbc9adfc0f3f82695bd2459aff9b35e71ff21 SOURCE_SUM=6159da945fe504bffe23f80d299bfe3e146a9d9df76412f5bea6d1d415516d34
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=
SOURCE_FILENAME=

6
conf/nginx.conf
View file

@ -3,11 +3,6 @@ location __PATH__/ {
alias __FINALPATH__/; alias __FINALPATH__/;
# Force https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
if (!-e $request_filename) { if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?req=$1; rewrite ^(.*)$ /index.php?req=$1;
} }
@ -64,5 +59,4 @@ location __PATH__/ {
location ~ /util { location ~ /util {
deny all; deny all;
} }
} }

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Ethical fediverse server alternative", "en": "Ethical fediverse server alternative",
"fr": "serveur fedverse éthique" "fr": "serveur fedverse éthique"
}, },
"version": "21.10.21~ynh1", "version": "21.11.28~ynh1",
"url": "https://zotlabs.com/zap/", "url": "https://zotlabs.com/zap/",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
@ -18,7 +18,7 @@
"name": "" "name": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 4.3.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [

4
scripts/_common.sh
View file

@ -7,9 +7,7 @@
# dependencies used by the app # dependencies used by the app
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.3"
extra_php_dependencies="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" 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"
# dependencies used by the app
pkg_dependencies="postgresql postgresql-contrib"
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS

2
scripts/install
View file

@ -205,7 +205,7 @@ ynh_add_nginx_config
ynh_script_progression --message="Configuring PHP-FPM..." ynh_script_progression --message="Configuring PHP-FPM..."
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_fpm_config --package="$extra_php_dependencies" ynh_add_fpm_config
#================================================= #=================================================
# CRON JOB CONFIGURATION # CRON JOB CONFIGURATION

5
scripts/restore
View file

@ -38,8 +38,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." ynh_script_progression --message="Validating restoration parameters..."
test ! -d $final_path \ test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
|| ynh_die --message="There is already a directory: $final_path "
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
@ -96,8 +95,6 @@ fi
ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_script_progression --message="Restoring PHP-FPM configuration..."
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
# Recreate a dedicated php-fpm config
ynh_add_fpm_config --package="$extra_php_dependencies"
#================================================= #=================================================
# RESTORE THE CRON FILE # RESTORE THE CRON FILE

2
scripts/upgrade
View file

@ -162,7 +162,7 @@ ynh_add_nginx_config
ynh_script_progression --message="Upgrading PHP-FPM configuration..." ynh_script_progression --message="Upgrading PHP-FPM configuration..."
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_fpm_config --package="$extra_php_dependencies" ynh_add_fpm_config
### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.
### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it.