YunoHost-Apps/yeswiki_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/yeswiki_ynh.git synced 2024-09-03 18:05:56 +02:00
Code Issues Activity Actions

Merge pull request #6 from YunoHost-Apps/testing

Browse source 
1.0~ynh2
This commit is contained in:
Plumf 2020-05-07 00:48:43 +02:00 committed by GitHub
commit 3b91370131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
check_process
View file

@ -27,8 +27,8 @@
upgrade=0 from_commit=65c382d138596fcb32b4c97c39398815a1dcd4e8
backup_restore=1
multi_instance=1
port_already_use=0 (66)
change_url=0
port_already_use=1 (66)
change_url=1
actions=0
config_panel=0
;;; Levels

14
manifest.json
View file

@ -3,16 +3,16 @@
"id": "yeswiki",
"packaging_format": 1,
"description": {
"en": "$app is free software born from the cross-fertilization of the discussions and know-how of developers and facilitators of cooperative projects.",
"fr": "$app est un logiciel libre né du croisement des discussions et savoir-faire de développeurs et animateurs de projets coopératifs."
"en": "YesWiki is a wiki that is quick and easy to use, with a nice design and a French-speaking support community.",
"fr": "YesWiki est wiki facile et rapide à prendre en main, avec un design agréable et une communauté d'entraide francophone."
},
"version": "1.0~ynh1",
"version": "1.0~ynh2",
"url": "https://yeswiki.net/",
"license": "free",
"maintainer": {
"name": "Plumf",
"email": "plumf@open-plug.eu",
"url": "http://plumf.eu"
"url": "https://plumf.eu"
},
"requirements": {
"yunohost": ">= 3.7.0"
@ -62,8 +62,8 @@
},
"default": true,
"help": {
"en": "If $app is made public anyone will be able to view the wiki",
"fr": "Si $app est rendu publique toute personne pourra consulter le wiki"
"en": "If YesWiki is made public anyone will be able to view the wiki",
"fr": "Si YesWiki est rendu publique toute personne pourra consulter le wiki"
}
},
@ -74,7 +74,7 @@
"en": "Choose the application language",
"fr": "Choisissez la langue de l'application"
},
"choices": ["fr", "en"],
"choices": ["fr", "en", "ca", "es", "nl", "pt"],
"default": "fr"
},
{

6
scripts/change_url
View file

@ -92,10 +92,10 @@ fi
if [ $change_domain -eq 1 ]
then
# Delete file checksum for the old conf file location
#ynh_delete_file_checksum --file="$nginx_conf_path"
ynh_delete_file_checksum --file="$nginx_conf_path"
mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
# Store file checksum for the new config file location
#ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
fi
#=================================================
@ -104,6 +104,8 @@ fi
# ...
#=================================================
ynh_replace_string --match_string="https://$old_domain${old_path%/}" --replace_string="https://$new_domain${new_path%/}" --target_file="$final_path/wakka.config.php"
#=================================================
# GENERIC FINALISATION
#=================================================

12
scripts/install
View file

@ -157,7 +157,7 @@ chown -R $app: $final_path
# Set the app as temporarily public for curl call
ynh_script_progression --message="Configuring SSOwat..." --weight=42
ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
ynh_permission_update --permission main --remove all_users --add visitors
# Reload SSOwat config
yunohost app ssowatconf
@ -176,7 +176,7 @@ ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language
# Remove the public access
if [ $is_public -eq 0 ]
then
ynh_app_setting_delete --app=$app --key=skipped_uris
ynh_permission_update --permission main --remove visitors --add all_users
fi
#=================================================
@ -195,11 +195,11 @@ chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php}
ynh_script_progression --message="Configuring SSOwat..." --weight=47
# Make app public if necessary
if [ $is_public -eq 1 ]
then
#if [ $is_public -eq 1 ]
#then
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi
# ynh_permission_update --permission main --add visitors
#fi
#=================================================
# RELOAD NGINX

25
scripts/upgrade
View file

@ -121,22 +121,6 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2
# Create a dedicated php-fpm config
ynh_add_fpm_config
#=================================================
# SPECIFIC UPGRADE
#=================================================
# ...
#=================================================
#=================================================
# STORE THE CONFIG FILE CHECKSUM
#=================================================
### 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.
#####ynh_backup_if_checksum_is_different --file="$final_path/CONFIG_FILE"
# Recalculate and store the checksum of the file for the next upgrade.
#####ynh_store_file_checksum --file="$final_path/CONFIG_FILE"
#=================================================
# GENERIC FINALIZATION
#=================================================
@ -145,6 +129,7 @@ ynh_add_fpm_config
# Set permissions on app files
chown -R root: $final_path
chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php}
#=================================================
# SETUP SSOWAT
@ -152,11 +137,11 @@ chown -R root: $final_path
ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=29
# Make app public if necessary
if [ $is_public -eq 1 ]
then
#if [ $is_public -eq 1 ]
#then
# unprotected_uris allows SSO credentials to be passed anyway
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi
#ynh_permission_update --permission main --remove all_users --add visitors
#fi
#=================================================
# RELOAD NGINX