From 02222e3b02c067698675230314fd6d18af746fae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Nov 2020 11:37:56 +0100 Subject: [PATCH] Small typos --- README.md | 8 ++++---- scripts/install | 10 ++++++---- scripts/restore | 3 ++- scripts/upgrade | 15 ++------------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index af06d34..6c92ad4 100755 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ LionWiki-t2t is a minimalist Wiki engine programmed in PHP. It is extensible, te ## Configuration -In the root folder of this app, there are two files: config.php and config.t2t +In the root folder of this app, there are two files: `config.php` and `config.t2t` -- config.php is for changing password, the template used, default page. You can also define an administrator password which has some more rights (it's possible to lock some pages and modify them only with the administrator password, add some IP address to a blacklist) +- `config.php` is for changing password, the template used, default page. You can also define an administrator password which has some more rights (it's possible to lock some pages and modify them only with the administrator password, add some IP address to a blacklist) -- config.t2t is for tweaking your wiki syntax. You can define more tags (using the txt2tags rules) for specific behaviors. +- `config.t2t` is for tweaking your wiki syntax. You can define more tags (using the txt2tags rules) for specific behaviors. -The pheditor.php tool at the root of the site allows you to edit all the necessary configuration files. You can remove or rename it from its interface. The password is the same as the one defined during installation. +The `pheditor.php` tool at the root of the site allows you to edit all the necessary configuration files. You can remove or rename it from its interface. The password is the same as the one defined during installation. ## Documentation diff --git a/scripts/install b/scripts/install index d9ef036..c35358a 100755 --- a/scripts/install +++ b/scripts/install @@ -201,8 +201,9 @@ find $final_path/templates/minimaxing/minimaxing.css -type f -print0 | xargs -0 # find : -rw-r--r-- 1 1001 1002 241 May 3 08:36 index.html => GOOD #================================================= -# INTEGRATE SERVICE IN YUNOHOST +# ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" @@ -211,11 +212,12 @@ yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var #================================================= ynh_script_progression --message="Configuring SSOwat..." --weight=1 -# Make app public if necessary +# Make app public if necessary or protect it 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="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index e7ffa2e..8be1abb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -93,8 +93,9 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "A short description of the app" --log "/var/log/$app/$app.log" +yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index f7deb8f..fe23048 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -129,23 +129,12 @@ ynh_store_file_checksum --file="$final_path/menu.php" chown -R root: $final_path #================================================= -# INTEGRATE SERVICE IN YUNOHOST +# ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1 - -# Make app public if necessary -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 - #================================================= # RELOAD NGINX #=================================================