From 4fa6a82d8db962a376f18fef3ce48a9a79cde67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Wed, 18 May 2016 22:31:45 +0200 Subject: [PATCH 01/27] [enh] Make use of YunoHost helpers and harden set options --- scripts/backup | 33 ++++++++++++++++------------- scripts/install | 55 +++++++++++++++++++++++++++++-------------------- scripts/remove | 32 +++++++++++++++------------- scripts/restore | 42 ++++++++++++++++++++++++------------- scripts/upgrade | 47 ++++++++++++++++++++++-------------------- 5 files changed, 123 insertions(+), 86 deletions(-) diff --git a/scripts/backup b/scripts/backup index ee0c712..0b907ab 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,26 +1,31 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu +# See comments in install script app=$YNH_APP_INSTANCE_NAME -# The first argument is the backup directory location for the app -# from where the script is executed and which will be compressed afterward -backup_dir=$YNH_APP_BACKUP_DIR +# Source YunoHost helpers +. /usr/share/yunohost/helpers # Backup sources & data -sudo cp -a "/var/www/${app}" ./sources +# Note: the last argument is where to save this path, see the restore script. +ynh_backup "/var/www/${app}" "sources" -# Backup mysql database if needed -# db_pwd=$(sudo yunohost app setting $app mysqlpwd) -# sudo mysqldump -u $app -p$db_pwd $app > ./dump.sql +# If a MySQL database is used: +# +# # Dump the database +# dbname=$app +# dbuser=$app +# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) +# mysqldump -u "$dbuser" -p"$dbpass" --no-create-db "$dbname" > ./dump.sql # Copy NGINX configuration -domain=$(sudo yunohost app setting "$app" domain) -sudo cp -a "/etc/nginx/conf.d/${domain}.d/${app}.conf" ./nginx.conf +domain=$(ynh_app_setting_get "$app" domain) +ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" -# If a dedicated php-fpm process is used : -# Copy dedicated php-fpm process to backup folder +# If a dedicated php-fpm process is used: # -#sudo cp -a "/etc/php5/fpm/pool.d/${app}.conf" ./php-fpm.conf +# # Copy PHP-FPM pool configuration +# ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf" diff --git a/scripts/install b/scripts/install index e85d91d..2c44b45 100755 --- a/scripts/install +++ b/scripts/install @@ -1,7 +1,7 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu # This is a multi-instance app, meaning it can be installed several times independently # The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -22,14 +22,17 @@ admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +# Source YunoHost helpers +. /usr/share/yunohost/helpers + # Save app settings -sudo yunohost app setting $app admin -v "$admin" -sudo yunohost app setting $app is_public -v "$is_public" -sudo yunohost app setting $app language -v "$language" +ynh_app_setting_set "$app" admin "$admin" +ynh_app_setting_set "$app" is_public "$is_public" +ynh_app_setting_set "$app" language "$language" # Check domain/path availability -sudo yunohost app checkurl $domain$path -a $app \ - || (echo "Path not available: $domain$path" && exit 1) +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" # Copy source files final_path=/var/www/$app @@ -41,10 +44,18 @@ sudo cp -a ../sources/. $final_path sudo chown -R root:root $final_path # If your app use a MySQL database you can use these lines to bootstrap -# a database, an associated user and save the password in app settings -# db_pwd=$(openssl rand -hex 15) -# sudo yunohost app initdb $app -p $db_pwd -# sudo yunohost app setting $app mysqlpwd -v $db_pwd +# a database, an associated user and save the password in app settings. +# +# # Generate MySQL password and create database +# dbuser=$app +# dbname=$app +# dbpass=$(ynh_string_random 12) +# ynh_app_setting_set "$app" mysqlpwd "$dbpass" +# ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" +# +# # Load initial SQL into the new database +# ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" \ +# < "../sources/sql/mysql.init.sql" # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf @@ -52,31 +63,31 @@ sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/nginx.conf accordingly or your app will not work! # -#sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf +# sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf # If a dedicated php-fpm process is used: -# Adjustment and copy dedicated php-fpm conf file # Don't forget to modify ../conf/php-fpm.conf accordingly or your app will not work! # -#sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -#sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf -#finalphpconf=/etc/php5/fpm/pool.d/$app.conf -#sudo cp ../conf/php-fpm.conf $finalphpconf -#sudo chown root: $finalphpconf -#sudo chmod 644 $finalphpconf +# # Modify PHP-FPM pool configuration and copy it to the pool directory +# sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf +# sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf +# finalphpconf=/etc/php5/fpm/pool.d/$app.conf +# sudo cp ../conf/php-fpm.conf $finalphpconf +# sudo chown root: $finalphpconf +# sudo chmod 644 $finalphpconf # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. - sudo yunohost app setting $app unprotected_uris -v "/" + ynh_app_setting_set "$app" unprotected_uris "/" fi -# If dedicated php-fpm process: +# If a dedicated php-fpm process is used: # -#sudo service php5-fpm reload +# sudo service php5-fpm reload # Restart services sudo service nginx reload diff --git a/scripts/remove b/scripts/remove index 54028f3..eb493bd 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,13 +1,13 @@ #!/bin/bash -# The last argument is the app instance name -app=${!#} +# See comments in install script +app=$YNH_APP_INSTANCE_NAME -# Retrieve arguments -domain=$(sudo yunohost app setting $app domain) -path=$(sudo yunohost app setting $app path) -admin=$(sudo yunohost app setting $app admin) -is_public=$(sudo yunohost app setting $app is_public) +# Source YunoHost helpers +. /usr/share/yunohost/helpers + +# Retrieve app settings +domain=$(ynh_app_setting_get "$app" domain) # Remove sources sudo rm -rf /var/www/$app @@ -15,14 +15,18 @@ sudo rm -rf /var/www/$app # Remove configuration files sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf -# If a database is used, remove it -# root_pwd=$(sudo cat /etc/yunohost/mysql) -# mysql -u root -p$root_pwd -e "DROP DATABASE $app ; DROP USER $app@localhost ;" - -# If a dedicated php-fpm process is used : +# If a dedicated php-fpm process is used: # -#sudo rm -f /etc/php5/fpm/pool.d/$app.conf -#sudo service php5-fpm reload +# sudo rm -f /etc/php5/fpm/pool.d/$app.conf +# sudo service php5-fpm reload + +# If a MySQL database is used: +# +# # Drop MySQL database and user +# dbname=$app +# dbuser=$app +# ynh_mysql_drop_db "$dbname" || true +# ynh_mysql_drop_user "$dbuser" || true # Restart services sudo service nginx reload diff --git a/scripts/restore b/scripts/restore index ac89823..52280e4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,13 +1,24 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Note: each files and directories you've saved using the ynh_backup helper +# will be located in the current directory, regarding the last argument. +# Exit on command errors and treat unset variables as an error +set -eu + +# See comments in install script app=$YNH_APP_INSTANCE_NAME -# The first argument is the backup directory location of the app -# from where the script is executed -backup_dir=$YNH_APP_BACKUP_DIR +# Source YunoHost helpers +. /usr/share/yunohost/helpers + +# Retrieve old app settings +domain=$(ynh_app_setting_get "$app" domain) +path=$(ynh_app_setting_get "$app" path) + +# Check domain/path availability +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" # Restore sources & data final_path="/var/www/${app}" @@ -17,20 +28,23 @@ sudo cp -a ./sources "$final_path" # you may need to make some file and/or directory writeable by www-data (nginx user) sudo chown -R root:root "$final_path" -# Restore mysql database if needed -# db_pwd=$(sudo yunohost app setting $app mysqlpwd) -# sudo mysql -u $app -p$db_pwd $app < ./dump.sql +# If a MySQL database is used: +# +# # Create and restore the database +# dbname=$app +# dbuser=$app +# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) +# ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" +# ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./dump.sql # Restore NGINX configuration -domain=$(sudo yunohost app setting "$app" domain) sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" -# If a dedicated php-fpm process is used : -# Copy dedicated php-fpm process from backup folder to the right location -# And restart service +# If a dedicated php-fpm process is used: # -#sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" -#sudo service php5-fpm reload +# # Copy PHP-FPM pool configuration and reload the service +# sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" +# sudo service php5-fpm reload # Restart webserver sudo service nginx reload diff --git a/scripts/upgrade b/scripts/upgrade index 37d8816..8acea57 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,17 +1,20 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu # See comments in install script app=$YNH_APP_INSTANCE_NAME -# Retrieve arguments -domain=$(sudo yunohost app setting $app domain) -path=$(sudo yunohost app setting $app path) -admin=$(sudo yunohost app setting $app admin) -is_public=$(sudo yunohost app setting $app is_public) -language=$(sudo yunohost app setting $app language) +# Source YunoHost helpers +. /usr/share/yunohost/helpers + +# Retrieve app settings +domain=$(ynh_app_setting_get "$app" domain) +path=$(ynh_app_setting_get "$app" path) +admin=$(ynh_app_setting_get "$app" admin) +is_public=$(ynh_app_setting_get "$app" is_public) +language=$(ynh_app_setting_get "$app" language) # Remove trailing "/" for next commands path=${path%/} @@ -28,33 +31,33 @@ sudo chown -R root:root $final_path # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf -# If a dedicated php-fpm process is used : +# If a dedicated php-fpm process is used: # -#sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf +# sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf -# If a dedicated php-fpm process is used : -# Adjustment and copy dedicated php-fpm conf file +# If a dedicated php-fpm process is used: # -#sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -#sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf -#finalphpconf=/etc/php5/fpm/pool.d/$app.conf -#sudo cp ../conf/php-fpm.conf $finalphpconf -#sudo chown root: $finalphpconf -#sudo chmod 644 $finalphpconf +# # Modify PHP-FPM pool configuration and copy it to the pool directory +# sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf +# sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf +# finalphpconf=/etc/php5/fpm/pool.d/$app.conf +# sudo cp ../conf/php-fpm.conf $finalphpconf +# sudo chown root: $finalphpconf +# sudo chmod 644 $finalphpconf # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # See install script - sudo yunohost app setting $app unprotected_uris -v "/" + ynh_app_setting_set "$app" unprotected_uris "/" # Remove old settings - sudo yunohost app setting $app skipped_uris -d + ynh_app_setting_delete "$app" skipped_uris fi -# If a dedicated php-fpm process is used : +# If a dedicated php-fpm process is used: # -#sudo service php5-fpm restart +# sudo service php5-fpm restart # Restart services sudo service nginx reload From 16f11425a26e7ac2fe91e8b2332fe5ed378b0c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Sun, 29 May 2016 16:43:43 +0200 Subject: [PATCH 02/27] [fix] There is no old settings to remove at upgrade in this app --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8acea57..490a18d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,8 +51,6 @@ if [[ $is_public -eq 1 ]]; then # See install script ynh_app_setting_set "$app" unprotected_uris "/" - # Remove old settings - ynh_app_setting_delete "$app" skipped_uris fi # If a dedicated php-fpm process is used: From bdbe0ac79e510958bd0d63119a6754d739e53d29 Mon Sep 17 00:00:00 2001 From: Moul Date: Mon, 13 Jun 2016 22:25:00 +0200 Subject: [PATCH 03/27] [enh] review, variables, typo, syntax, fixes - update yunohost package version dependency - use variable for $nginx_conf - rename $final_path to $src_path variable for data path - other small fixes --- README.md | 4 ++-- manifest.json | 2 +- scripts/install | 28 +++++++++++++--------------- scripts/remove | 2 +- scripts/restore | 6 +++--- scripts/upgrade | 24 ++++++++++++------------ 6 files changed, 32 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 27f7f34..6d6cb13 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# YunoHost example app # +# YunoHost example app -## Usage ## +## Usage - Add application source files into `sources` subfolder. - Edit `conf/nginx.conf` file to match application prerequisites. - Edit manifest with application specific information. diff --git a/manifest.json b/manifest.json index b327c3f..513d033 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "url": "http://example.com" }, "requirements": { - "yunohost": ">> 2.3.12.1" + "yunohost": ">> 2.4.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 2c44b45..3b3f328 100755 --- a/scripts/install +++ b/scripts/install @@ -35,13 +35,13 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \ || ynh_die "Path not available: ${domain}${path}" # Copy source files -final_path=/var/www/$app -sudo mkdir -p $final_path -sudo cp -a ../sources/. $final_path +src_path=/var/www/$app +sudo mkdir -p $src_path +sudo cp -a ../sources/. $src_path # Set permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root:root $final_path +sudo chown -R root: $src_path # If your app use a MySQL database you can use these lines to bootstrap # a database, an associated user and save the password in app settings. @@ -58,36 +58,34 @@ sudo chown -R root:root $final_path # < "../sources/sql/mysql.init.sql" # Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf -sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +nginx_conf=../conf/nginx.conf +sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf +sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/nginx.conf accordingly or your app will not work! # -# sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf +# sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf +sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/php-fpm.conf accordingly or your app will not work! # # # Modify PHP-FPM pool configuration and copy it to the pool directory # sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -# sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf +# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf # finalphpconf=/etc/php5/fpm/pool.d/$app.conf # sudo cp ../conf/php-fpm.conf $finalphpconf # sudo chown root: $finalphpconf # sudo chmod 644 $finalphpconf # If app is public, add url to SSOWat conf as skipped_uris -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" unprotected_uris "/" fi +# Reload services +sudo service nginx reload # If a dedicated php-fpm process is used: -# # sudo service php5-fpm reload - -# Restart services -sudo service nginx reload diff --git a/scripts/remove b/scripts/remove index eb493bd..9be714b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -28,5 +28,5 @@ sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf # ynh_mysql_drop_db "$dbname" || true # ynh_mysql_drop_user "$dbuser" || true -# Restart services +# Reload nginx service sudo service nginx reload diff --git a/scripts/restore b/scripts/restore index 52280e4..9dc6974 100755 --- a/scripts/restore +++ b/scripts/restore @@ -21,12 +21,12 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \ || ynh_die "Path not available: ${domain}${path}" # Restore sources & data -final_path="/var/www/${app}" -sudo cp -a ./sources "$final_path" +src_path="/var/www/${app}" +sudo cp -a ./sources "$src_path" # Restore permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root:root "$final_path" +sudo chown -R root: "$src_path" # If a MySQL database is used: # diff --git a/scripts/upgrade b/scripts/upgrade index 490a18d..138c2df 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,35 +20,35 @@ language=$(ynh_app_setting_get "$app" language) path=${path%/} # Copy source files -final_path=/var/www/$app -sudo mkdir -p $final_path -sudo cp -a ../sources/. $final_path +src_path=/var/www/$app +sudo mkdir -p $src_path +sudo cp -a ../sources/. $src_path # Set permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root:root $final_path +sudo chown -R root: $src_path # Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf -sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +nginx_conf=../conf/nginx.conf +sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf +sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # If a dedicated php-fpm process is used: # -# sudo sed -i "s@YNH_WWW_APP@$app@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf +# sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf +sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # If a dedicated php-fpm process is used: # # # Modify PHP-FPM pool configuration and copy it to the pool directory # sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -# sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/php-fpm.conf +# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf # finalphpconf=/etc/php5/fpm/pool.d/$app.conf # sudo cp ../conf/php-fpm.conf $finalphpconf # sudo chown root: $finalphpconf # sudo chmod 644 $finalphpconf # If app is public, add url to SSOWat conf as skipped_uris -if [[ $is_public -eq 1 ]]; -then +if [[ $is_public -eq 1 ]]; then # See install script ynh_app_setting_set "$app" unprotected_uris "/" fi @@ -57,5 +57,5 @@ fi # # sudo service php5-fpm restart -# Restart services +# Reload nginx service sudo service nginx reload From daaf1005d5acf179e615385174a7bbf84b3cc277 Mon Sep 17 00:00:00 2001 From: Moul Date: Tue, 14 Jun 2016 14:09:29 +0200 Subject: [PATCH 04/27] =?UTF-8?q?[enh]=20create=20blocks=20for=20MySQL=20a?= =?UTF-8?q?nd=20PHP=C2=A0command=20lines=20which=20are=20optionnals.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/nginx.conf | 3 ++- scripts/backup | 6 ++++-- scripts/install | 9 +++++---- scripts/remove | 8 +++++--- scripts/restore | 6 ++++-- scripts/upgrade | 8 +++----- 6 files changed, 23 insertions(+), 17 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2033083..8c76342 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,7 +3,7 @@ location YNH_WWW_PATH { # Path to source alias YNH_WWW_ALIAS ; - # Example PHP configuration + # Example PHP configuration (remove if not used) index index.php; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file @@ -26,6 +26,7 @@ location YNH_WWW_PATH { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } + # PHP configuration end # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/scripts/backup b/scripts/backup index 0b907ab..d678ee2 100755 --- a/scripts/backup +++ b/scripts/backup @@ -13,19 +13,21 @@ app=$YNH_APP_INSTANCE_NAME # Note: the last argument is where to save this path, see the restore script. ynh_backup "/var/www/${app}" "sources" +### MySQL (remove if not used) ### # If a MySQL database is used: -# # # Dump the database # dbname=$app # dbuser=$app # dbpass=$(ynh_app_setting_get "$app" mysqlpwd) # mysqldump -u "$dbuser" -p"$dbpass" --no-create-db "$dbname" > ./dump.sql +### MySQL end ### # Copy NGINX configuration domain=$(ynh_app_setting_get "$app" domain) ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" +### PHP (remove if not used) ### # If a dedicated php-fpm process is used: -# # # Copy PHP-FPM pool configuration # ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf" +### PHP end ### diff --git a/scripts/install b/scripts/install index 3b3f328..d4f9039 100755 --- a/scripts/install +++ b/scripts/install @@ -43,6 +43,7 @@ sudo cp -a ../sources/. $src_path # you may need to make some file and/or directory writeable by www-data (nginx user) sudo chown -R root: $src_path +### MySQL (can be removed if not used) ### # If your app use a MySQL database you can use these lines to bootstrap # a database, an associated user and save the password in app settings. # @@ -56,6 +57,7 @@ sudo chown -R root: $src_path # # Load initial SQL into the new database # ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" \ # < "../sources/sql/mysql.init.sql" +### MySQL end ### # Modify Nginx configuration file and copy it to Nginx conf directory nginx_conf=../conf/nginx.conf @@ -63,10 +65,10 @@ sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/nginx.conf accordingly or your app will not work! -# # sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +### PHP (can be removed if not used) ### # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/php-fpm.conf accordingly or your app will not work! # @@ -77,6 +79,8 @@ sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # sudo cp ../conf/php-fpm.conf $finalphpconf # sudo chown root: $finalphpconf # sudo chmod 644 $finalphpconf +# sudo service php5-fpm reload +### PHP end ### # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then @@ -86,6 +90,3 @@ fi # Reload services sudo service nginx reload - -# If a dedicated php-fpm process is used: -# sudo service php5-fpm reload diff --git a/scripts/remove b/scripts/remove index 9be714b..fdbcc3f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,21 +12,23 @@ domain=$(ynh_app_setting_get "$app" domain) # Remove sources sudo rm -rf /var/www/$app -# Remove configuration files +# Remove nginx configuration file sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf +### PHP (remove if not used) ### # If a dedicated php-fpm process is used: -# # sudo rm -f /etc/php5/fpm/pool.d/$app.conf # sudo service php5-fpm reload +### PHP end ### +### MySQL (remove if not used) ### # If a MySQL database is used: -# # # Drop MySQL database and user # dbname=$app # dbuser=$app # ynh_mysql_drop_db "$dbname" || true # ynh_mysql_drop_user "$dbuser" || true +### MySQL end ### # Reload nginx service sudo service nginx reload diff --git a/scripts/restore b/scripts/restore index 9dc6974..9acd9e6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,23 +28,25 @@ sudo cp -a ./sources "$src_path" # you may need to make some file and/or directory writeable by www-data (nginx user) sudo chown -R root: "$src_path" +### MySQL (remove if not used) ### # If a MySQL database is used: -# # # Create and restore the database # dbname=$app # dbuser=$app # dbpass=$(ynh_app_setting_get "$app" mysqlpwd) # ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" # ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./dump.sql +### MySQL end ### # Restore NGINX configuration sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" +### PHP (remove if not used) ### # If a dedicated php-fpm process is used: -# # # Copy PHP-FPM pool configuration and reload the service # sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" # sudo service php5-fpm reload +### PHP end ### # Restart webserver sudo service nginx reload diff --git a/scripts/upgrade b/scripts/upgrade index 138c2df..27742a9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,8 +37,8 @@ sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +### PHP (remove if not used) ### # If a dedicated php-fpm process is used: -# # # Modify PHP-FPM pool configuration and copy it to the pool directory # sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf # sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf @@ -46,6 +46,8 @@ sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # sudo cp ../conf/php-fpm.conf $finalphpconf # sudo chown root: $finalphpconf # sudo chmod 644 $finalphpconf +# sudo service php5-fpm restart +### PHP end ### # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then @@ -53,9 +55,5 @@ if [[ $is_public -eq 1 ]]; then ynh_app_setting_set "$app" unprotected_uris "/" fi -# If a dedicated php-fpm process is used: -# -# sudo service php5-fpm restart - # Reload nginx service sudo service nginx reload From 7c82a96ca393d018d3b3413e6bfca2b77406d0a7 Mon Sep 17 00:00:00 2001 From: Moul Date: Tue, 14 Jun 2016 14:11:00 +0200 Subject: [PATCH 05/27] [enh] scripts: use source cmd to retreive helpers. --- scripts/backup | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/backup b/scripts/backup index d678ee2..af8ccd9 100755 --- a/scripts/backup +++ b/scripts/backup @@ -7,7 +7,7 @@ set -eu app=$YNH_APP_INSTANCE_NAME # Source YunoHost helpers -. /usr/share/yunohost/helpers +source /usr/share/yunohost/helpers # Backup sources & data # Note: the last argument is where to save this path, see the restore script. diff --git a/scripts/install b/scripts/install index d4f9039..f1b2bf4 100755 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,7 @@ is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE # Source YunoHost helpers -. /usr/share/yunohost/helpers +source /usr/share/yunohost/helpers # Save app settings ynh_app_setting_set "$app" admin "$admin" diff --git a/scripts/remove b/scripts/remove index fdbcc3f..59ef331 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,7 +4,7 @@ app=$YNH_APP_INSTANCE_NAME # Source YunoHost helpers -. /usr/share/yunohost/helpers +source /usr/share/yunohost/helpers # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) diff --git a/scripts/restore b/scripts/restore index 9acd9e6..a83fa6d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,7 +10,7 @@ set -eu app=$YNH_APP_INSTANCE_NAME # Source YunoHost helpers -. /usr/share/yunohost/helpers +source /usr/share/yunohost/helpers # Retrieve old app settings domain=$(ynh_app_setting_get "$app" domain) diff --git a/scripts/upgrade b/scripts/upgrade index 27742a9..1decc77 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,7 @@ set -eu app=$YNH_APP_INSTANCE_NAME # Source YunoHost helpers -. /usr/share/yunohost/helpers +source /usr/share/yunohost/helpers # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) From 05891c56c8783a4cba57402b672e3272ded17537 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:15:19 +0200 Subject: [PATCH 06/27] Delete README.md --- sources/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 sources/README.md diff --git a/sources/README.md b/sources/README.md deleted file mode 100644 index bd2bfad..0000000 --- a/sources/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Place the sources of the webapp in this folder. - -This file can be removed. From b86543a49beea1bf0ab9d3c99c7d73b1f86303c2 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:19:04 +0200 Subject: [PATCH 07/27] Update manifest.json --- manifest.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.json b/manifest.json index 513d033..22d3d21 100644 --- a/manifest.json +++ b/manifest.json @@ -60,15 +60,6 @@ "fr": "Est-ce une application publique ?" }, "default": true - }, - { - "name": "language", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["fr", "en"], - "default": "fr" } ] } From 326ddb57714a36994f5a24b76330d5ab506d2b75 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:22:04 +0200 Subject: [PATCH 08/27] Update install --- scripts/install | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index f1b2bf4..dcda1fb 100755 --- a/scripts/install +++ b/scripts/install @@ -20,7 +20,7 @@ domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE +#language=$YNH_APP_ARG_LANGUAGE # Source YunoHost helpers source /usr/share/yunohost/helpers @@ -28,7 +28,7 @@ source /usr/share/yunohost/helpers # Save app settings ynh_app_setting_set "$app" admin "$admin" ynh_app_setting_set "$app" is_public "$is_public" -ynh_app_setting_set "$app" language "$language" +#ynh_app_setting_set "$app" language "$language" # Check domain/path availability sudo yunohost app checkurl "${domain}${path}" -a "$app" \ @@ -37,7 +37,11 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \ # Copy source files src_path=/var/www/$app sudo mkdir -p $src_path -sudo cp -a ../sources/. $src_path +sudo wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$src_path"/laverna.zip +sudo unzip "$src_path"/laverna.zip -d "$src_path" +sudo cp -R "$src_path"/static-laverna-gh-pages/* "$src_path" +sudo rm "$src_path"/laverna.zip +sudo rm -rf "$src_path"/static-laverna-gh-pages # Set permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) From 5175748f4fb99ff3153f952e430552459ec469cc Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:27:28 +0200 Subject: [PATCH 09/27] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8c76342..b551a9a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location YNH_WWW_PATH { alias YNH_WWW_ALIAS ; # Example PHP configuration (remove if not used) - index index.php; + index index.html; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; From 985ab8bbd372421ca909e42b8e5e3247c0e23c14 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:33:59 +0200 Subject: [PATCH 10/27] Update install --- scripts/install | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/scripts/install b/scripts/install index dcda1fb..f563573 100755 --- a/scripts/install +++ b/scripts/install @@ -3,7 +3,6 @@ # Exit on command errors and treat unset variables as an error set -eu -# This is a multi-instance app, meaning it can be installed several times independently # The id of the app as stated in the manifest is available as $YNH_APP_ID # The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) # The app instance name is available as $YNH_APP_INSTANCE_NAME @@ -20,7 +19,6 @@ domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -#language=$YNH_APP_ARG_LANGUAGE # Source YunoHost helpers source /usr/share/yunohost/helpers @@ -28,7 +26,6 @@ source /usr/share/yunohost/helpers # Save app settings ynh_app_setting_set "$app" admin "$admin" ynh_app_setting_set "$app" is_public "$is_public" -#ynh_app_setting_set "$app" language "$language" # Check domain/path availability sudo yunohost app checkurl "${domain}${path}" -a "$app" \ @@ -44,48 +41,15 @@ sudo rm "$src_path"/laverna.zip sudo rm -rf "$src_path"/static-laverna-gh-pages # Set permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) sudo chown -R root: $src_path -### MySQL (can be removed if not used) ### -# If your app use a MySQL database you can use these lines to bootstrap -# a database, an associated user and save the password in app settings. -# -# # Generate MySQL password and create database -# dbuser=$app -# dbname=$app -# dbpass=$(ynh_string_random 12) -# ynh_app_setting_set "$app" mysqlpwd "$dbpass" -# ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" -# -# # Load initial SQL into the new database -# ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" \ -# < "../sources/sql/mysql.init.sql" -### MySQL end ### # Modify Nginx configuration file and copy it to Nginx conf directory nginx_conf=../conf/nginx.conf sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf -# If a dedicated php-fpm process is used: -# Don't forget to modify ../conf/nginx.conf accordingly or your app will not work! -# sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf -### PHP (can be removed if not used) ### -# If a dedicated php-fpm process is used: -# Don't forget to modify ../conf/php-fpm.conf accordingly or your app will not work! -# -# # Modify PHP-FPM pool configuration and copy it to the pool directory -# sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf -# finalphpconf=/etc/php5/fpm/pool.d/$app.conf -# sudo cp ../conf/php-fpm.conf $finalphpconf -# sudo chown root: $finalphpconf -# sudo chmod 644 $finalphpconf -# sudo service php5-fpm reload -### PHP end ### - # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. From d93cd4cb2ac743ade01df35ea7e1b0c8bd155b4c Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:34:35 +0200 Subject: [PATCH 11/27] Update remove --- scripts/remove | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/scripts/remove b/scripts/remove index 59ef331..9a5dc51 100755 --- a/scripts/remove +++ b/scripts/remove @@ -15,20 +15,5 @@ sudo rm -rf /var/www/$app # Remove nginx configuration file sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# sudo rm -f /etc/php5/fpm/pool.d/$app.conf -# sudo service php5-fpm reload -### PHP end ### - -### MySQL (remove if not used) ### -# If a MySQL database is used: -# # Drop MySQL database and user -# dbname=$app -# dbuser=$app -# ynh_mysql_drop_db "$dbname" || true -# ynh_mysql_drop_user "$dbuser" || true -### MySQL end ### - # Reload nginx service sudo service nginx reload From 811d40a3d62761bb9ac33dc83fe55ef52111bdcb Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:34:59 +0200 Subject: [PATCH 12/27] Delete .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 39a7e2ec6c0339cccca0fa2128010063733bdf72 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:37:38 +0200 Subject: [PATCH 13/27] Update manifest.json --- manifest.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/manifest.json b/manifest.json index 22d3d21..d8db678 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,17 @@ { - "name": "YunoHost example app", - "id": "ynhexample", + "name": "Laverna", + "id": "laverna", "packaging_format": 1, "description": { - "en": "Example package for YunoHost application.", - "fr": "Exemple de package d’application pour YunoHost." + "en": "Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote.", + "fr": "Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote." }, - "url": "https://example.com", + "url": "https://laverna.cc/index.html", "license": "free", "maintainer": { - "name": "John doe", - "email": "john.doe@example.com", - "url": "http://example.com" + "name": "Alex", + "email": "apulido@free.fr", + "url": "https://github.com/likeitneverwentaway/laverna_ynh" }, "requirements": { "yunohost": ">> 2.4.0" @@ -28,8 +28,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for ynhexample", - "fr": "Choisissez un nom de domaine pour ynhexample" + "en": "Choose a domain name for Laverna", + "fr": "Choisissez un nom de domaine pour Laverna" }, "example": "example.com" }, @@ -37,11 +37,11 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for ynhexample", - "fr": "Choisissez un chemin pour ynhexample" + "en": "Choose a path for Laverna", + "fr": "Choisissez un chemin pour Laverna" }, - "example": "/example", - "default": "/example" + "example": "/laverna", + "default": "/laverna" }, { "name": "admin", From 8a9d91b40dc09532ee8eacc91c7c23e900a5c844 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:39:11 +0200 Subject: [PATCH 14/27] Delete README.md --- README.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 6d6cb13..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# YunoHost example app - -## Usage -- Add application source files into `sources` subfolder. -- Edit `conf/nginx.conf` file to match application prerequisites. -- Edit manifest with application specific information. -- Edit the install, upgrade, remove, backup, restore scripts. -- Add a LICENSE file for the package. - -**More information on the documentation page:** -https://yunohost.org/packaging_apps From 0ede9aebe821d579a9bf10621cfd438d30a63043 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Sun, 26 Jun 2016 20:39:39 +0200 Subject: [PATCH 15/27] Add files via upload --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d564b4d --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +Laverna package for Yunohost +------------- + +Laverna prebuilt package for Yunohost + +Links +------------- +- Laverna : https://laverna.cc/index.html +- YunoHost : https://yunohost.org/ From ba5324bec15e8996d8dd5bdfed5d412e8afa3c0a Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 29 Mar 2020 13:24:36 +0200 Subject: [PATCH 16/27] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d564b4d..1dd924f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Laverna package for Yunohost ------------- +[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) + Laverna prebuilt package for Yunohost Links From 1510d30337db04c98d15484e08f99e71d12f1d2a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 19:32:18 +0100 Subject: [PATCH 17/27] Fix --- README.md | 74 ++++++++++- conf/nginx.conf | 21 ++- conf/php-fpm.conf | 327 +++++++++++++++++++++++++++++++++++----------- manifest.json | 24 ++-- 4 files changed, 342 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 1dd924f..58b2b84 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,71 @@ -Laverna package for Yunohost -------------- +# Laverna for YunoHost -[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) +[![Install Laverna with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=laverna) +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Laverna quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview Laverna prebuilt package for Yunohost -Links -------------- -- Laverna : https://laverna.cc/index.html -- YunoHost : https://yunohost.org/ +**Shipped version:** 1.0 + +## Screenshots + +![](Link to a screenshot of this app.) + +## Demo + +* [Official demo](Link to a demo site for this app.) + +## Configuration + +How to configure this app: From an admin panel, a plain file with SSH, or any other way. + +## Documentation + + * Official documentation: Link to the official documentation of this app + * YunoHost documentation: If specific documentation is needed, feel free to contribute. + +## YunoHost specific features + +#### Multi-user support + +Are LDAP and HTTP auth supported? +Can the app be used by multiple users? + +#### Supported architectures + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) + +## Limitations + +* Any known limitations. + +## Additional information + +* Other info you would like to add about this app. + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/laverna_ynh/issues + * App website: https://laverna.cc/index.html + * Upstream app repository: Link to the official repository of the upstream app. + * YunoHost website: https://yunohost.org/ + +--- + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/laverna_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +or +sudo yunohost app upgrade laverna -u https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +``` diff --git a/conf/nginx.conf b/conf/nginx.conf index b551a9a..7781acc 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,16 @@ -location YNH_WWW_PATH { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { # Path to source - alias YNH_WWW_ALIAS ; + alias __FINALPATH__/ ; + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } # Example PHP configuration (remove if not used) - index index.html; + index index.html index.php; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; @@ -12,13 +18,7 @@ location YNH_WWW_PATH { try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; - - # Filename to be changed if dedicated php-fpm process is required - # This is to be used INSTEAD of line above - # Don't forget to adjust scripts install/upgrade/remove/backup accordingly - # - #fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock; + fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-YNH_WWW_APP.sock; fastcgi_index index.php; include fastcgi_params; @@ -26,7 +26,6 @@ location YNH_WWW_PATH { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } - # PHP configuration end # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 2061166..ab1a471 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -1,10 +1,11 @@ ; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the +; the variable $pool can be used in any directive and will be replaced by the ; pool name ('www' here) -[YNH_WWW_APP] +[__NAMETOCHANGE__] ; Per pool prefix ; It only applies on the following directives: +; - 'access.log' ; - 'slowlog' ; - 'listen' (unixsocket) ; - 'chroot' @@ -16,21 +17,43 @@ ; Default Value: none ;prefix = /path/to/pools/$pool +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = __USER__ +group = __USER__ + ; The address on which to accept FastCGI requests. ; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on ; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php5-fpm-YNH_WWW_APP.sock +listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = -1 +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 -; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +listen.owner = www-data +listen.group = www-data +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original ; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address ; must be separated by a comma. If this value is left blank, connections will be @@ -38,26 +61,26 @@ listen = /var/run/php5-fpm-YNH_WWW_APP.sock ; Default Value: any ;listen.allowed_clients = 127.0.0.1 -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0666 -listen.owner = www-data -listen.group = www-data -listen.mode = 0600 +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes ; Choose how the process manager will control the number of child processes. ; Possible Values: ; static - a fixed number (pm.max_children) of child processes; ; dynamic - the number of child processes are set dynamically based on the -; following directives: +; following directives. With this process management, there will be +; always at least 1 children. ; pm.max_children - the maximum number of children that can ; be alive at the same time. ; pm.start_servers - the number of children created on startup. @@ -69,73 +92,150 @@ group = www-data ; state (waiting to process). If the number ; of 'idle' processes is greater than this ; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. ; Note: This value is mandatory. pm = dynamic ; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes to be created when pm is set to 'dynamic'. +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. ; This value sets the limit on the number of simultaneous requests that will be ; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. ; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. -; Note: Used when pm is set to either 'static' or 'dynamic' +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' ; Note: This value is mandatory. -pm.max_children = 6 +pm.max_children = 5 ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 3 +pm.start_servers = 2 ; The desired minimum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 3 +pm.min_spare_servers = 1 ; The desired maximum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 5 +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. ; Default Value: 0 -pm.max_requests = 500 +;pm.max_requests = 500 ; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. By default, the status page shows the following -; information: -; accepted conn - the number of request accepted by the pool; +; recognized as a status page. It shows the following informations: ; pool - the name of the pool; -; process manager - static or dynamic; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; ; idle processes - the number of idle processes; ; active processes - the number of active processes; -; total processes - the number of idle + active processes. +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; ; max children reached - number of times, the process limit has been reached, ; when pm tries to start more children (works only for -; pm 'dynamic') -; The values of 'idle processes', 'active processes' and 'total processes' are -; updated each second. The value of 'accepted conn' is updated in real time. +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. ; Example output: -; accepted conn: 12073 ; pool: www ; process manager: static -; idle processes: 35 -; active processes: 65 -; total processes: 100 -; max children reached: 1 +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; ; By default the status page output is formatted as text/plain. Passing either -; 'html' or 'json' as a query string will return the corresponding output -; syntax. Example: +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: ; http://www.foo.bar/status ; http://www.foo.bar/status?json ; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: /usr/share/php/7.0/fpm/status.html +; ; Note: The value must start with a leading slash (/). The value can be ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -pm.status_path = /fpm-status +;pm.status_path = /status ; The ping URI to call the monitoring page of FPM. If this value is not set, no ; URI will be recognized as a ping page. This could be used to test from outside @@ -147,39 +247,102 @@ pm.status_path = /fpm-status ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -ping.path = /ping +;ping.path = /ping ; This directive may be used to customize the response of a ping request. The ; response is formatted as text/plain with a 200 response code. ; Default Value: pong ;ping.response = pong -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 120s +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) ; Default Value: 0 -request_slowlog_timeout = 5s +;request_slowlog_timeout = 0 -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/YNH_WWW_APP.slow.log +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +request_terminate_timeout = 1d ; Set open file descriptor rlimit. ; Default Value: system defined value -rlimit_files = 4096 +;rlimit_files = 1024 ; Set max core size rlimit. ; Possible Values: 'unlimited' or an integer greater or equal to 0 ; Default Value: system defined value -rlimit_core = 0 +;rlimit_core = 0 ; Chroot to this directory at the start. This value must be defined as an ; absolute path. When this value is not set, chroot is not used. @@ -195,14 +358,31 @@ rlimit_core = 0 ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot -chdir = /var/www/YNH_WWW_ALIAS +chdir = __FINALPATH__ ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. ; Note: on highloaded environement, this can cause some delay in the page ; process time (several ms). ; Default Value: no -catch_workers_output = yes +;catch_workers_output = yes + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; execute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. @@ -238,14 +418,13 @@ catch_workers_output = yes ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M -# Common values to change to increase file upload limit -;php_value[upload_max_filesize] = 50M -;php_value[post_max_size] = 50M -;php_value[mail.add_x_header] = Off - -# Other common parameters -;php_value[max_execution_time] = 600 -;php_value[max_input_time] = 300 -;php_value[memory_limit] = 256M -;php_value[short_open_tag] = On +; Common values to change to increase file upload limit +; php_admin_value[upload_max_filesize] = 50M +; php_admin_value[post_max_size] = 50M +; php_admin_flag[mail.add_x_header] = Off +; Other common parameters +; php_admin_value[max_execution_time] = 600 +; php_admin_value[max_input_time] = 300 +; php_admin_value[memory_limit] = 256M +; php_admin_flag[short_open_tag] = On diff --git a/manifest.json b/manifest.json index d8db678..28a2e6f 100644 --- a/manifest.json +++ b/manifest.json @@ -3,23 +3,23 @@ "id": "laverna", "packaging_format": 1, "description": { - "en": "Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote.", - "fr": "Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote." + "en": "Taking note application with Markdown editor and encryption support.", + "fr": "Application de Prise de note avec éditeur Markdown et chiffrement." }, + "version": "1.0~ynh1", "url": "https://laverna.cc/index.html", "license": "free", "maintainer": { "name": "Alex", - "email": "apulido@free.fr", - "url": "https://github.com/likeitneverwentaway/laverna_ynh" + "email": "apulido@free.fr" }, "requirements": { - "yunohost": ">> 2.4.0" + "yunohost": ">> 4.0.0" }, "multi_instance": true, "services": [ "nginx", - "php5-fpm", + "php7.0-fpm", "mysql" ], "arguments": { @@ -34,8 +34,8 @@ "example": "example.com" }, { - "name": "path", - "type": "path", + "name": "path", + "type": "path", "ask": { "en": "Choose a path for Laverna", "fr": "Choisissez un chemin pour Laverna" @@ -44,8 +44,8 @@ "default": "/laverna" }, { - "name": "admin", - "type": "user", + "name": "admin", + "type": "user", "ask": { "en": "Choose an admin user", "fr": "Choisissez l’administrateur" @@ -53,8 +53,8 @@ "example": "johndoe" }, { - "name": "is_public", - "type": "boolean", + "name": "is_public", + "type": "boolean", "ask": { "en": "Is it a public application?", "fr": "Est-ce une application publique ?" From c0b1374c5dd4cc4cf7ef4262c23710db4ba10e7e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 19:36:33 +0100 Subject: [PATCH 18/27] Update install --- scripts/install | 116 +++++++++++++++++++++++++++++++----------------- 1 file changed, 76 insertions(+), 40 deletions(-) diff --git a/scripts/install b/scripts/install index f563573..9745be7 100755 --- a/scripts/install +++ b/scripts/install @@ -1,60 +1,96 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +ynh_clean_setup () { + true +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# RETRIEVE ARGUMENTS FROM THE MANIFEST +#================================================= -# The id of the app as stated in the manifest is available as $YNH_APP_ID -# The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) -# The app instance name is available as $YNH_APP_INSTANCE_NAME -# - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -# - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -# - ynhexample__{N} for the subsequent installations, with N=3,4, ... -# The app instance name is probably what you are interested the most, since this is -# guaranteed to be unique. This is a good unique identifier to define installation path, -# db names, ... app=$YNH_APP_INSTANCE_NAME -# Retrieve arguments domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -# Source YunoHost helpers -source /usr/share/yunohost/helpers +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= +ynh_script_progression --message="Storing installation settings..." --time --weight=1 -# Save app settings -ynh_app_setting_set "$app" admin "$admin" -ynh_app_setting_set "$app" is_public "$is_public" +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public -# Check domain/path availability -sudo yunohost app checkurl "${domain}${path}" -a "$app" \ - || ynh_die "Path not available: ${domain}${path}" +#================================================= +# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS +#================================================= +ynh_script_progression --message="Validating installation parameters..." --time --weight=1 -# Copy source files -src_path=/var/www/$app -sudo mkdir -p $src_path -sudo wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$src_path"/laverna.zip -sudo unzip "$src_path"/laverna.zip -d "$src_path" -sudo cp -R "$src_path"/static-laverna-gh-pages/* "$src_path" -sudo rm "$src_path"/laverna.zip -sudo rm -rf "$src_path"/static-laverna-gh-pages +final_path=/var/www/$app +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" + +# Register (book) web path +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url + + + +mkdir -p $final_path +wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$final_path"/laverna.zip +unzip "$final_path"/laverna.zip -d "$final_path" +cp -R "$final_path"/static-laverna-gh-pages/* "$final_path" +rm "$final_path"/laverna.zip +rm -rf "$final_path"/static-laverna-gh-pages # Set permissions to app files -sudo chown -R root: $src_path +chown -R root: $final_path +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring nginx web server..." --time --weight=1 -# Modify Nginx configuration file and copy it to Nginx conf directory -nginx_conf=../conf/nginx.conf -sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf -sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +# Create a dedicated nginx config +ynh_add_nginx_config -# If app is public, add url to SSOWat conf as skipped_uris -if [[ $is_public -eq 1 ]]; then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set "$app" unprotected_uris "/" +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Configuring SSOwat..." --time --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 services -sudo service nginx reload +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Installation of $app completed" --last From c6118b001f8047688bb048736d087dcbe87f4e56 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 19:39:36 +0100 Subject: [PATCH 19/27] Create _common.sh --- scripts/_common.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 scripts/_common.sh diff --git a/scripts/_common.sh b/scripts/_common.sh new file mode 100644 index 0000000..e69de29 From ac015a56d7170b209543914e4eefb1ad95c632a2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 20:47:23 +0100 Subject: [PATCH 20/27] Fix --- check_process | 34 ++++++++++++++++++++ conf/app.src | 6 ++++ scripts/install | 27 +++++++++++----- scripts/remove | 83 ++++++++++++++++++++++++++++++++++++++++++------- scripts/upgrade | 35 +++++++++++++++------ 5 files changed, 158 insertions(+), 27 deletions(-) create mode 100644 check_process create mode 100644 conf/app.src diff --git a/check_process b/check_process new file mode 100644 index 0000000..4733388 --- /dev/null +++ b/check_process @@ -0,0 +1,34 @@ +# See here for more information +# https://github.com/YunoHost/package_check#syntax-check_process-file + +# Move this file from check_process.default to check_process when you have filled it. + +;; Test complet + ; Manifest + domain="domain.tld" (DOMAIN) + path="/path" (PATH) + admin="john" (USER) + is_public=1 (PUBLIC|public=1|private=0) + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + port_already_use=0 + change_url=1 +;;; Levels + # If the level 5 (Package linter) is forced to 1. Please add justifications here. + Level 5=auto +;;; Options +Email= +Notification=none +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + diff --git a/conf/app.src b/conf/app.src new file mode 100644 index 0000000..91e022b --- /dev/null +++ b/conf/app.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/Laverna/static-laverna/archive/gh-pages.zip +SOURCE_SUM=226224a141eeefefcf446e8ba4bda3f9ea7be6e96cd1992b185d44d5ef58e7d3 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/scripts/install b/scripts/install index 9745be7..aa6fd34 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ ynh_abort_if_errors app=$YNH_APP_INSTANCE_NAME domain=$YNH_APP_ARG_DOMAIN -path=$YNH_APP_ARG_PATH +path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC @@ -50,14 +50,27 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_script_progression --message="Setting up source files..." --time --weight=1 + +ynh_app_setting_set --app=$app --key=final_path --value=$final_path +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$final_path" -mkdir -p $final_path -wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$final_path"/laverna.zip -unzip "$final_path"/laverna.zip -d "$final_path" -cp -R "$final_path"/static-laverna-gh-pages/* "$final_path" -rm "$final_path"/laverna.zip -rm -rf "$final_path"/static-laverna-gh-pages + +# mkdir -p $final_path +# wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$final_path"/laverna.zip +# unzip "$final_path"/laverna.zip -d "$final_path" +# cp -R "$final_path"/static-laverna-gh-pages/* "$final_path" +# rm "$final_path"/laverna.zip +# rm -rf "$final_path"/static-laverna-gh-pages + +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= # Set permissions to app files chown -R root: $final_path diff --git a/scripts/remove b/scripts/remove index 9a5dc51..42b25eb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,19 +1,80 @@ #!/bin/bash -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# Source YunoHost helpers +source _common.sh source /usr/share/yunohost/helpers -# Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --time --weight=1 -# Remove sources -sudo rm -rf /var/www/$app +app=$YNH_APP_INSTANCE_NAME -# Remove nginx configuration file -sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf +domain=$(ynh_app_setting_get --app=$app --key=domain) +port=$(ynh_app_setting_get --app=$app --key=port) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name +final_path=$(ynh_app_setting_get --app=$app --key=final_path) + +#================================================= +# REMOVE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Removing the MySQL database..." --time --weight=1 + +# Remove a database if it exists, along with the associated user +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name + +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --time --weight=1 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + +#================================================= +# REMOVE APP MAIN DIR +#================================================= +ynh_script_progression --message="Removing app main directory..." --time --weight=1 + +# Remove the app directory securely +ynh_secure_remove --file="$final_path" + +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1 + +# Remove the dedicated nginx config +ynh_remove_nginx_config + +#================================================= +# REMOVE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1 + +# Remove the dedicated php-fpm config +ynh_remove_fpm_config + +#================================================= +# GENERIC FINALIZATION +#================================================= +# REMOVE DEDICATED USER +#================================================= +ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 + +# Delete a system user +ynh_system_user_delete --username=$app + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Removal of $app completed" --time --last -# Reload nginx service -sudo service nginx reload diff --git a/scripts/upgrade b/scripts/upgrade index 1decc77..37a8917 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,8 +21,8 @@ path=${path%/} # Copy source files src_path=/var/www/$app -sudo mkdir -p $src_path -sudo cp -a ../sources/. $src_path +mkdir -p $src_path +cp -a ../sources/. $src_path # Set permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) @@ -35,7 +35,7 @@ sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # If a dedicated php-fpm process is used: # # sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf ### PHP (remove if not used) ### # If a dedicated php-fpm process is used: @@ -49,11 +49,28 @@ sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # sudo service php5-fpm restart ### PHP end ### -# If app is public, add url to SSOWat conf as skipped_uris -if [[ $is_public -eq 1 ]]; then - # See install script - ynh_app_setting_set "$app" unprotected_uris "/" +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Upgrading SSOwat configuration..." --time --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 service -sudo service nginx reload +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Upgrade of $app completed" --time --last + From 590ab52234aeb579af854f8ba2a7afee30435679 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 20:59:46 +0100 Subject: [PATCH 21/27] Fix --- LICENSE | 676 ++++++++++++++++++++++++++++++++++++++++++++- README.md | 10 +- conf/nginx.conf | 20 +- conf/php-fpm.conf | 430 ---------------------------- manifest.json | 2 +- scripts/backup | 61 ++-- scripts/change_url | 98 +++++++ scripts/install | 52 ++-- scripts/remove | 49 +--- scripts/restore | 110 +++++--- scripts/upgrade | 139 ++++++---- 11 files changed, 1003 insertions(+), 644 deletions(-) delete mode 100644 conf/php-fpm.conf create mode 100644 scripts/change_url diff --git a/LICENSE b/LICENSE index ac17d84..6b156fe 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1,675 @@ -File containning the license of your package. +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/README.md b/README.md index 58b2b84..85d8684 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Laverna prebuilt package for Yunohost -**Shipped version:** 1.0 +**Shipped version:** 0.7.51 ## Screenshots @@ -19,7 +19,7 @@ Laverna prebuilt package for Yunohost ## Demo -* [Official demo](Link to a demo site for this app.) +* [Official demo](https://laverna.cc/app/) ## Configuration @@ -34,8 +34,8 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot #### Multi-user support -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? + * Are LDAP and HTTP auth supported? + * Can the app be used by multiple users? #### Supported architectures @@ -54,7 +54,7 @@ Can the app be used by multiple users? * Report a bug: https://github.com/YunoHost-Apps/laverna_ynh/issues * App website: https://laverna.cc/index.html - * Upstream app repository: Link to the official repository of the upstream app. + * Upstream app repository: https://github.com/Laverna/laverna * YunoHost website: https://yunohost.org/ --- diff --git a/conf/nginx.conf b/conf/nginx.conf index 7781acc..11cb4b2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,24 +9,6 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - # Example PHP configuration (remove if not used) - index index.html index.php; - - # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file - #client_max_body_size 50M; - - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-YNH_WWW_APP.sock; - - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; -} +} \ No newline at end of file diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index ab1a471..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __FINALPATH__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -; php_admin_value[max_execution_time] = 600 -; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On diff --git a/manifest.json b/manifest.json index 28a2e6f..23c337e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Taking note application with Markdown editor and encryption support.", "fr": "Application de Prise de note avec éditeur Markdown et chiffrement." }, - "version": "1.0~ynh1", + "version": "0.7.51~ynh1", "url": "https://laverna.cc/index.html", "license": "free", "maintainer": { diff --git a/scripts/backup b/scripts/backup index af8ccd9..99f4abc 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,33 +1,44 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# See comments in install script -app=$YNH_APP_INSTANCE_NAME - -# Source YunoHost helpers source /usr/share/yunohost/helpers -# Backup sources & data -# Note: the last argument is where to save this path, see the restore script. -ynh_backup "/var/www/${app}" "sources" +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= -### MySQL (remove if not used) ### -# If a MySQL database is used: -# # Dump the database -# dbname=$app -# dbuser=$app -# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) -# mysqldump -u "$dbuser" -p"$dbpass" --no-create-db "$dbname" > ./dump.sql -### MySQL end ### +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors -# Copy NGINX configuration -domain=$(ynh_app_setting_get "$app" domain) -ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" +#================================================= +# LOAD SETTINGS +#================================================= +ynh_print_info --message="Backing up 243..." -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Copy PHP-FPM pool configuration -# ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf" -### PHP end ### +app=$YNH_APP_INSTANCE_NAME + +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +domain=$(ynh_app_setting_get --app=$app --key=domain) + +#================================================= +# BACKUP THE APP MAIN DIR +#================================================= + +ynh_backup --src_path="$final_path" + +#================================================= +# BACKUP THE NGINX CONFIGURATION +#================================================= + +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..a5d8867 --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,98 @@ +#!/bin/bash + +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source /usr/share/yunohost/helpers + +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# RETRIEVE ARGUMENTS FROM THE MANIFEST +#================================================= +# Retrieve arguments + +domain=$YNH_APP_ARG_DOMAIN +path_url=$YNH_APP_ARG_PATH +is_public=$YNH_APP_ARG_IS_PUBLIC + +app=$YNH_APP_INSTANCE_NAME + +#================================================= +# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS +#================================================= +ynh_script_progression --message="Validating installation parameters..." --weight=1 + +# Copy files to the right place +final_path=/var/www/$app +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" + +# Register (book) web path +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url + +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= +ynh_script_progression --message="Storing installation settings..." --weight=2 + +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public + +#================================================= +# STANDARD MODIFICATIONS +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_script_progression --message="Setting up source files..." --weight=1 + +ynh_app_setting_set --app=$app --key=final_path --value=$final_path + +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$final_path" + +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + +#================================================= +# GENERIC FINALIZATION +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= + +# Set permissions to app files +chown -R root: $final_path + +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Configuring SSOwat..." --weight=1 + +# Make app public if necessary or protect it +[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" + +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/install b/scripts/install index aa6fd34..5b15446 100755 --- a/scripts/install +++ b/scripts/install @@ -23,21 +23,12 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -app=$YNH_APP_INSTANCE_NAME - domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 - -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public +app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -50,6 +41,15 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= +ynh_script_progression --message="Storing installation settings..." --time --weight=1 + +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -59,14 +59,13 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 - -# mkdir -p $final_path -# wget -P "$src_path" https://github.com/Laverna/static-laverna/archive/gh-pages.zip -O "$final_path"/laverna.zip -# unzip "$final_path"/laverna.zip -d "$final_path" -# cp -R "$final_path"/static-laverna-gh-pages/* "$final_path" -# rm "$final_path"/laverna.zip -# rm -rf "$final_path"/static-laverna-gh-pages +# Create a dedicated NGINX config +ynh_add_nginx_config #================================================= # SECURE FILES AND DIRECTORIES @@ -75,30 +74,23 @@ ynh_setup_source --dest_dir="$final_path" # Set permissions to app files chown -R root: $final_path -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring nginx web server..." --time --weight=1 - -# Create a dedicated nginx config -ynh_add_nginx_config - #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --time --weight=1 +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 #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 42b25eb..2123569 100755 --- a/scripts/remove +++ b/scripts/remove @@ -6,42 +6,24 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Removing the MySQL database..." --time --weight=1 - -# Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - +# STANDARD REMOVE #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing $app main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -49,32 +31,13 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1 - -# Remove the dedicated php-fpm config -ynh_remove_fpm_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last - +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index a83fa6d..c2896b5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,52 +1,82 @@ #!/bin/bash -# Note: each files and directories you've saved using the ynh_backup helper -# will be located in the current directory, regarding the last argument. +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# Exit on command errors and treat unset variables as an error -set -eu - -# See comments in install script -app=$YNH_APP_INSTANCE_NAME - -# Source YunoHost helpers source /usr/share/yunohost/helpers -# Retrieve old app settings -domain=$(ynh_app_setting_get "$app" domain) -path=$(ynh_app_setting_get "$app" path) +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= -# Check domain/path availability -sudo yunohost app checkurl "${domain}${path}" -a "$app" \ - || ynh_die "Path not available: ${domain}${path}" +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors -# Restore sources & data -src_path="/var/www/${app}" -sudo cp -a ./sources "$src_path" +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading settings..." --weight=1 -# Restore permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root: "$src_path" +app=$YNH_APP_INSTANCE_NAME -### MySQL (remove if not used) ### -# If a MySQL database is used: -# # Create and restore the database -# dbname=$app -# dbuser=$app -# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) -# ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" -# ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./dump.sql -### MySQL end ### +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Restore NGINX configuration -sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" +#================================================= +# CHECK IF THE APP CAN BE RESTORED +#================================================= +ynh_script_progression --message="Validating restoration parameters..." --weight=1 -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Copy PHP-FPM pool configuration and reload the service -# sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" -# sudo service php5-fpm reload -### PHP end ### +ynh_webpath_available --domain=$domain --path_url=$path_url \ + || ynh_die --message="Path not available: ${domain}${path_url}" +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " -# Restart webserver -sudo service nginx reload +#================================================= +# STANDARD RESTORATION STEPS +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= +ynh_script_progression --message="Restoring $app main directory..." --weight=2 + +ynh_restore_file --origin_path="$final_path" + +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app + +#================================================= +# RESTORE USER RIGHTS +#================================================= + +# Restore permissions on app files +chown -R root: $final_path + +#================================================= +# GENERIC FINALIZATION +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=3 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 37a8917..993d052 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,70 +1,110 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# See comments in install script -app=$YNH_APP_INSTANCE_NAME - -# Source YunoHost helpers source /usr/share/yunohost/helpers -# Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) -path=$(ynh_app_setting_get "$app" path) -admin=$(ynh_app_setting_get "$app" admin) -is_public=$(ynh_app_setting_get "$app" is_public) -language=$(ynh_app_setting_get "$app" language) +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 -# Remove trailing "/" for next commands -path=${path%/} +app=$YNH_APP_INSTANCE_NAME -# Copy source files -src_path=/var/www/$app -mkdir -p $src_path -cp -a ../sources/. $src_path +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +is_public=$(ynh_app_setting_get --app=$app --key=is_public) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Set permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root: $src_path +#================================================= +# CHECK VERSION +#================================================= -# Modify Nginx configuration file and copy it to Nginx conf directory -nginx_conf=../conf/nginx.conf -sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf -sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf -# If a dedicated php-fpm process is used: -# -# sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf -cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +upgrade_type=$(ynh_check_app_version_changed) -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Modify PHP-FPM pool configuration and copy it to the pool directory -# sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf -# finalphpconf=/etc/php5/fpm/pool.d/$app.conf -# sudo cp ../conf/php-fpm.conf $finalphpconf -# sudo chown root: $finalphpconf -# sudo chmod 644 $finalphpconf -# sudo service php5-fpm restart -### PHP end ### +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Fix is_public as a boolean value +if [ "$is_public" = "Yes" ]; then + ynh_app_setting_set --app=$app --key=is_public --value=1 + is_public=1 +elif [ "$is_public" = "No" ]; then + ynh_app_setting_set --app=$app --key=is_public --value=0 + is_public=0 +fi + +# If final_path doesn't exist, create it +if [ -z "$final_path" ]; then + final_path=/var/www/$app + ynh_app_setting_set --app=$app --key=final_path --value=$final_path +fi + +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=3 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# CHECK THE PATH +#================================================= + +path_url=$(ynh_normalize_url_path --path_url=$path_url) + +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=4 + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" +fi + +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= + +# Set permissions on app files +chown -R root: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --time --weight=1 +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 +# Make app public if necessary or protect it +[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -72,5 +112,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --time --last - +ynh_script_progression --message="Upgrade of $app completed" --last From 9282a7bb64f0dd929c938fc6005529506824004e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:05:02 +0100 Subject: [PATCH 22/27] Fix --- manifest.json | 2 +- scripts/_common.sh | 17 +++++++ scripts/backup | 4 +- scripts/change_url | 119 ++++++++++++++++++++++++--------------------- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 10 +--- 8 files changed, 88 insertions(+), 70 deletions(-) diff --git a/manifest.json b/manifest.json index 23c337e..a9e5e4b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version": "0.7.51~ynh1", "url": "https://laverna.cc/index.html", - "license": "free", + "license": "MPL-2.0", "maintainer": { "name": "Alex", "email": "apulido@free.fr" diff --git a/scripts/_common.sh b/scripts/_common.sh index e69de29..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +#================================================= +# COMMON VARIABLES +#================================================= + +#================================================= +# PERSONAL HELPERS +#================================================= + +#================================================= +# EXPERIMENTAL HELPERS +#================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index 99f4abc..532eb2a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -18,7 +18,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Backing up 243..." +ynh_print_info --message="Backing up Laverna..." app=$YNH_APP_INSTANCE_NAME @@ -41,4 +41,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for Laverna. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index a5d8867..bab3080 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,93 +1,102 @@ #!/bin/bash #================================================= -# GENERIC START +# GENERIC STARTING #================================================= # IMPORT GENERIC HELPERS #================================================= source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script +# Stop script if errors ynh_abort_if_errors #================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST +# RETRIEVE ARGUMENTS #================================================= -# Retrieve arguments -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC +old_domain=$YNH_APP_OLD_DOMAIN +old_path=$YNH_APP_OLD_PATH + +new_domain=$YNH_APP_NEW_DOMAIN +new_path=$YNH_APP_NEW_PATH app=$YNH_APP_INSTANCE_NAME #================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS +# LOAD SETTINGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 -# Copy files to the right place -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +# Needed for helper "ynh_add_nginx_config" +final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= -# STORE SETTINGS FROM MANIFEST +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=2 +ynh_script_progression --message="Backing up Laverna before changing its URL..." --weight=2 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors #================================================= -# STANDARD MODIFICATIONS -#================================================= -# DOWNLOAD, CHECK AND UNPACK SOURCE -#================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 - -ynh_app_setting_set --app=$app --key=final_path --value=$final_path - -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES +# CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -# Set permissions to app files -chown -R root: $final_path +change_domain=0 +if [ "$old_domain" != "$new_domain" ] +then + change_domain=1 +fi + +change_path=0 +if [ "$old_path" != "$new_path" ] +then + change_path=1 +fi #================================================= -# SETUP SSOWAT +# MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 -# Make app public if necessary or protect it -[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" +nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf + +# Change the path in the NGINX config file +if [ $change_path -eq 1 ] +then + # Make a backup of the original NGINX config file if modified + ynh_backup_if_checksum_is_different --file="$nginx_conf_path" + # Set global variables for NGINX helper + domain="$old_domain" + path_url="$new_path" + # Create a dedicated NGINX config + ynh_add_nginx_config +fi + +# Change the domain for NGINX +if [ $change_domain -eq 1 ] +then + # Delete file checksum for the old conf file location + 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" +fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload @@ -95,4 +104,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression --message="Change of URL completed for Laverna" --last diff --git a/scripts/install b/scripts/install index 5b15446..7ae0820 100755 --- a/scripts/install +++ b/scripts/install @@ -98,4 +98,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression --message="Installation of Laverna completed" --last diff --git a/scripts/remove b/scripts/remove index 2123569..28ad183 100755 --- a/scripts/remove +++ b/scripts/remove @@ -40,4 +40,4 @@ ynh_remove_nginx_config # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression --message="Removal of Laverna completed" --last diff --git a/scripts/restore b/scripts/restore index c2896b5..3f60c97 100755 --- a/scripts/restore +++ b/scripts/restore @@ -79,4 +79,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression --message="Restoration completed for Laverna" --last diff --git a/scripts/upgrade b/scripts/upgrade index 993d052..b95b4b7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,14 +93,6 @@ ynh_add_nginx_config # Set permissions on app files chown -R root: $final_path -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1 - -# Make app public if necessary or protect it -[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" - #================================================= # RELOAD NGINX #================================================= @@ -112,4 +104,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade ofLaverna completed" --last From dc6f705a264aae5dcab1c48e96f8bf5e6d95e127 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:05:43 +0100 Subject: [PATCH 23/27] Update install --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 7ae0820..707e6b5 100755 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --time --weight=1 +ynh_script_progression --message="Validating installation parameters..." --weight=1 final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -44,7 +44,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url @@ -53,7 +53,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src @@ -62,7 +62,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config From ab323d3a8ed5e64ee24a802e00628f21de4bd089 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:06:36 +0100 Subject: [PATCH 24/27] Update nginx.conf --- conf/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 11cb4b2..17ed947 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,6 +9,8 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } + index index.html; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } \ No newline at end of file From 8514dc0eaf9fd56ffc3388a75944c267fda44ced Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:10:05 +0100 Subject: [PATCH 25/27] Update install --- scripts/install | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/install b/scripts/install index 707e6b5..b9b8118 100755 --- a/scripts/install +++ b/scripts/install @@ -74,19 +74,6 @@ ynh_add_nginx_config # Set permissions to app files chown -R root: $final_path -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 - -# Make app public if necessary or protect it -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission "main" --add "visitors" -fi - #================================================= # RELOAD NGINX #================================================= From f23b212b72c8741057ffdfe6f50d65cbd344b3ad Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:12:42 +0100 Subject: [PATCH 26/27] Fix --- scripts/_common.sh | 17 ----------------- scripts/install | 1 - 2 files changed, 18 deletions(-) delete mode 100644 scripts/_common.sh diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index 944a65e..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES -#================================================= - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/install b/scripts/install index b9b8118..f961379 100755 --- a/scripts/install +++ b/scripts/install @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh source /usr/share/yunohost/helpers #================================================= From bd40eef41461286ff256e9a87b853d16d8280817 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 21:21:23 +0100 Subject: [PATCH 27/27] Fix --- README.md | 11 +++--- README_fr.md | 72 +++++++++++++++++++++++++++++++++++++++ issue_template.md | 55 ++++++++++++++++++++++++++++++ pull_request_template.md | 18 ++++++++++ sources/laverna.png | Bin 0 -> 50827 bytes 5 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 README_fr.md create mode 100644 issue_template.md create mode 100644 pull_request_template.md create mode 100644 sources/laverna.png diff --git a/README.md b/README.md index 85d8684..cf851ee 100644 --- a/README.md +++ b/README.md @@ -3,19 +3,20 @@ [![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) [![Install Laverna with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=laverna) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this readme in english.](./README.md)* -> *This package allows you to install Laverna quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *Ce package vous permet d'installer Laverna rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Overview -Laverna prebuilt package for Yunohost +Laverna is an anonymous system, encrypted and without registration required, it is accessible via a web browser (without software installation). +The data is private because it is stored by default on your machine (InnoDB and localstorage), it is a setting in the settings that will allow you to synchronize it via the cloud on your various devices. **Shipped version:** 0.7.51 ## Screenshots -![](Link to a screenshot of this app.) +![](sources/laverna.png) ## Demo diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..294ea06 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,72 @@ +# Laverna pour YunoHost + +[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) +[![Installer Laverna avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=laverna) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Laverna quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Vue d'ensemble +Laverna est un système anonyme, crypté et sans inscription requise, il est accessible via un navigateur web (sans installation de logiciel). +Les données sont privées, car stockées par défaut sur votre machine (InnoDB et localstorage), c’est un réglage dans les paramètres qui vous permettra de les synchroniser via le cloud sur vos différents périphériques. + +**Version incluse :** 0.7.51 + +## Captures d'écran + +![](sources/laverna.png) + +## Démo + +* [Démo officielle](https://laverna.cc/app/) + +## Configuration + +Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. + +## Documentation + + * Documentation officielle : Lien vers la documentation officielle de cette application. + * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. + +## Caractéristiques spécifiques YunoHost + +#### Support multi-utilisateur + +* L'authentification LDAP et HTTP est-elle prise en charge ? +* L'application peut-elle être utilisée par plusieurs utilisateurs ? + +#### Architectures supportées + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) + +## Limitations + +* Limitations connues. + +## Informations additionnelles + +* Autres informations que vous souhaitez ajouter sur cette application. + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/laverna_ynh/issues + * Site de l'application : https://laverna.cc/index.html + * Dépôt de l'application principale : https://github.com/Laverna/laverna + * Site web YunoHost : https://yunohost.org/ + +--- + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/laverna_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +or +sudo yunohost app upgrade laverna -u https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +``` diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 0000000..f539f32 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Make sure you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *In doubt, ask here and we will figure it out together.* +3. *Delete these italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install laverna + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..b06349c --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,18 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Package_check results +--- +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/joblaverna_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/laverna_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/sources/laverna.png b/sources/laverna.png new file mode 100644 index 0000000000000000000000000000000000000000..128e16f67a37bea72aca05c8993936e5cf9235c6 GIT binary patch literal 50827 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

a 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 VH