From cf5503068baef57d319758f89ff2f2ce6a719a68 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 21 Mar 2019 12:00:19 +0100 Subject: [PATCH 1/5] Spacing --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index fc2be34..77a4134 100644 --- a/scripts/install +++ b/scripts/install @@ -196,6 +196,7 @@ ynh_add_systemd_config ### (It's compatible with sed regular expressions syntax) cp "../conf/.env" "$final_path/.env" + if [ "$path_url" == "/" ] then domain_uri="$domain" From 6d01be6a50f22974f358a9b72cc661e266823c15 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 23 Mar 2019 02:01:38 +0100 Subject: [PATCH 2/5] upgrade to 1.3.0 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4d9a355..741dd79 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A distributed pastebin. i.e. it is a service where anyone can post things on the A networked place to store posted web documents. This is meant to allow for distributed social commentary and reaction around these documents using best practices recommended or noted by the W3C Social Web Working Group. -**Shipped version:** 1.2.0 +**Shipped version:** 1.3.0 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 5334061..9595f68 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gobengo/distbin/archive/v1.2.0.tar.gz -SOURCE_SUM=ae72d386e9c68afa4d6b08f0a9c9b441a04176001beb226b903f924076e5cfcb +SOURCE_URL=https://github.com/gobengo/distbin/archive/v1.3.0.tar.gz +SOURCE_SUM=65d9774cafbb5829b82d09b0ea0d3d5d1ec5f076fadef2b8576d29a901c58a90 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b88c2b1..e19b3ef 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Distributed pastebin with ActivityPub.", "fr": "Pastebin distribué utilisant le protocole ActivityPub." }, - "version": "1.2.0~ynh3", + "version": "1.3.0~ynh3", "url": "https://example.com", "license": "Apache-2.0", "maintainer": { From 1da49affe7a8e0b45ea57a2e025fd56e8ce9cfb2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 23 Mar 2019 02:21:29 +0100 Subject: [PATCH 3/5] Update screenshot --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 741dd79..812ec80 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,7 @@ A networked place to store posted web documents. This is meant to allow for dist ## Screenshots -![distbin-screenshot1](https://user-images.githubusercontent.com/30271971/52230917-e4d88780-28b8-11e9-9eb1-64c08d26576a.png) - -![distbin-screenshot2](https://user-images.githubusercontent.com/30271971/52230927-e99d3b80-28b8-11e9-9e5d-439bf0feca8d.png) +![distbin-screenshot](https://user-images.githubusercontent.com/30271971/54859831-38405100-4d12-11e9-9273-e44596e04e5c.PNG) ## Demo From ed4ea6e909c05dfa8a48861fbfd31caea9b2d4e3 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 23 Mar 2019 06:05:30 +0100 Subject: [PATCH 4/5] Cleanup --- scripts/backup | 2 -- scripts/change_url | 2 -- scripts/install | 76 ---------------------------------------------- scripts/remove | 7 ----- scripts/restore | 5 +-- scripts/upgrade | 9 ------ 6 files changed, 1 insertion(+), 100 deletions(-) diff --git a/scripts/backup b/scripts/backup index 38060aa..b6d3f96 100644 --- a/scripts/backup +++ b/scripts/backup @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. ynh_clean_check_starting } # Exit if an error occurs during the execution of the script @@ -31,7 +30,6 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get $app final_path) domain=$(ynh_app_setting_get $app domain) -#db_name=$(ynh_app_setting_get $app db_name) #================================================= # STANDARD BACKUP STEPS diff --git a/scripts/change_url b/scripts/change_url index 5f53319..81f4a09 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,8 +114,6 @@ fi ynh_replace_string "EXTERNAL_URL=.*" "EXTERNAL_URL=https://$new_domain_uri/" "$final_path/.env" -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ynh_backup_if_checksum_is_different "$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/.env" diff --git a/scripts/install b/scripts/install index 77a4134..2ea2c62 100644 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. ynh_clean_check_starting } # Exit if an error occurs during the execution of the script @@ -27,21 +26,8 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -#admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -#language=$YNH_APP_ARG_LANGUAGE -#password=$YNH_APP_ARG_PASSWORD -### If it's 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 -### - 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 interests you 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 #================================================= @@ -49,8 +35,6 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_print_info "Validating installation parameters..." -### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". -### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app" final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" @@ -67,9 +51,7 @@ ynh_print_info "Storing installation settings..." ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path_url -#ynh_app_setting_set $app admin $admin ynh_app_setting_set $app is_public $is_public -#ynh_app_setting_set $app language $language #================================================= # STANDARD MODIFICATIONS @@ -78,15 +60,8 @@ ynh_app_setting_set $app is_public $is_public #================================================= ynh_print_info "Configuring firewall ..." -### Use these lines if you have to open a port for the application -### `ynh_find_port` will find the first available port starting from the given port. -### If you're not using these lines: -### - Remove the section "CLOSE A PORT" in the remove script - # Find a free port port=$(ynh_find_port 8095) -# Open this port -#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port ynh_app_setting_set $app port $port #================================================= @@ -94,13 +69,6 @@ ynh_app_setting_set $app port $port #================================================= ynh_print_info "Installing dependencies ..." -### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package. -### Those deb packages will be installed as dependencies of this package. -### If you're not using this helper: -### - Remove the section "REMOVE DEPENDENCIES" in the remove script -### - As well as the section "REINSTALL DEPENDENCIES" in the restore script -### - And the section "UPGRADE DEPENDENCIES" in the upgrade script - ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs 10 @@ -109,10 +77,6 @@ ynh_install_nodejs 10 #================================================= ynh_print_info "Setting up source files ..." -### `ynh_setup_source` is used to install an app from a zip or tar.gz file, -### downloaded from an upstream source, like a git repository. -### `ynh_setup_source` use the file conf/app.src - ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" @@ -122,8 +86,6 @@ ynh_setup_source "$final_path" #================================================= ynh_print_info "Configuring nginx web server..." -### `ynh_add_nginx_config` will use the file conf/nginx.conf - # Create a dedicated nginx config ynh_add_nginx_config @@ -174,17 +136,6 @@ popd #================================================= ynh_print_info "Configuring a systemd service ..." -### `ynh_systemd_config` is used to configure a systemd script for an app. -### It can be used for apps that use sysvinit (with adaptation) or systemd. -### Have a look at the app to be sure this app needs a systemd script. -### `ynh_systemd_config` will use the file conf/systemd.service -### If you're not using these lines: -### - You can remove those files in conf/. -### - Remove the section "BACKUP SYSTEMD" in the backup script -### - Remove also the section "STOP AND REMOVE SERVICE" in the remove script -### - As well as the section "RESTORE SYSTEMD" in the restore script -### - And the section "SETUP SYSTEMD" in the upgrade script - # Create a dedicated systemd config ynh_add_systemd_config @@ -192,9 +143,6 @@ ynh_add_systemd_config # MODIFY A CONFIG FILE #================================================= -### `ynh_replace_string` is used to replace a string in a file. -### (It's compatible with sed regular expressions syntax) - cp "../conf/.env" "$final_path/.env" if [ "$path_url" == "/" ] @@ -213,10 +161,6 @@ ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/.env" # STORE THE CONFIG FILE CHECKSUM #================================================= -### `ynh_store_file_checksum` is used to store the checksum of a file. -### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`, -### you can make a backup of this file before modifying it again if the admin had modified it. - # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$final_path/.env" @@ -226,10 +170,6 @@ ynh_store_file_checksum "$final_path/.env" # SECURE FILES AND DIRECTORIES #================================================= -### For security reason, any app should set the permissions to root: before anything else. -### Then, if write authorization is needed, any access should be given only to directories -### that really need such authorization. - # Set permissions to app files chown -R "$app":"$app" "$final_path" @@ -238,14 +178,6 @@ chown -R "$app":"$app" "$final_path" #================================================= ynh_print_info "Configuring log rotation ..." -### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app. -### Use this helper only if there is effectively a log file for this app. -### If you're not using this helper: -### - Remove the section "BACKUP LOGROTATE" in the backup script -### - Remove also the section "REMOVE LOGROTATE CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE LOGROTATE CONFIGURATION" in the restore script -### - And the section "SETUP LOGROTATE" in the upgrade script - # Use logrotate to manage application logfile(s) ynh_use_logrotate @@ -253,14 +185,6 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -### `yunohost service add` is a CLI yunohost command to add a service in the admin panel. -### You'll find the service in the 'services' section of YunoHost admin panel. -### This CLI command would be useless if the app does not have any services (systemd or sysvinit) -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "REMOVE SERVICE FROM ADMIN PANEL" in the remove script -### - As well as the section ADVERTISE SERVICE IN ADMIN PANEL" in the restore script - #yunohost service add $app --log "/var/log/$app/$app.log" # if using yunohost version 3.2 or more in the 'manifest.json', a description can be added yunohost service add $app --description "$app daemon for distbin" --log "/var/log/$app/$app.log" diff --git a/scripts/remove b/scripts/remove index a04366e..6a58f41 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) port=$(ynh_app_setting_get $app port) -#db_name=$(ynh_app_setting_get $app db_name) final_path=$(ynh_app_setting_get $app final_path) #================================================= @@ -93,12 +92,6 @@ fi # REMOVE THE CRON FILE #================================================= -# Remove a cron file -#ynh_secure_remove "/etc/cron.d/$app" - -# Remove a directory securely -#ynh_secure_remove "/etc/$app/" - # Remove the log files ynh_secure_remove "/var/log/$app/" diff --git a/scripts/restore b/scripts/restore index 79ce708..374982d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. ynh_clean_check_starting } # Exit if an error occurs during the execution of the script @@ -32,7 +31,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) final_path=$(ynh_app_setting_get $app final_path) -#db_name=$(ynh_app_setting_get $app db_name) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -124,9 +122,8 @@ ynh_restore_file "/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_print_info "Reloading nginx web server and php-fpm..." +ynh_print_info "Reloading nginx web server..." -#systemctl reload php7.0-fpm systemctl reload nginx #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b48c5a2..93090fe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,11 +19,8 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) -#admin=$(ynh_app_setting_get $app admin) is_public=$(ynh_app_setting_get $app is_public) final_path=$(ynh_app_setting_get $app final_path) -#language=$(ynh_app_setting_get $app language) -#db_name=$(ynh_app_setting_get $app db_name) port=$(ynh_app_setting_get $app port) #================================================= @@ -141,9 +138,6 @@ popd # MODIFY A CONFIG FILE #================================================= -### `ynh_replace_string` is used to replace a string in a file. -### (It's compatible with sed regular expressions syntax) - cp "../conf/.env" "$final_path/.env" if [ "$path_url" == "/" ] @@ -158,8 +152,6 @@ ynh_replace_string "__PORT__" "$port" "$final_path/.env" ynh_replace_string "__DOMAIN_URI__" "$domain_uri" "$final_path/.env" ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/.env" -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ynh_backup_if_checksum_is_different "$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/.env" @@ -187,7 +179,6 @@ ynh_add_systemd_config #================================================= # Set permissions on app files -#chown -R root: $final_path chown -R $app:$app $final_path #================================================= From 5c184173e1207d8eb84fd289c728237b728d4ca1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 23 Mar 2019 12:59:59 +0100 Subject: [PATCH 5/5] Update check_process --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index 9c48450..1be4578 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=b01da8e6f8d621a1b9c7aec4b82bbe96c0e7cc03 backup_restore=1 multi_instance=1 incorrect_path=1