diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b72f9be..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.swp diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 94722ed..0000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: python - -before_install: - - git clone https://github.com/YunoHost/package_linter /tmp/package_linter - -script: -- /tmp/package_linter/package_linter.py ./ diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..2d34b90 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +## Configuration + +How to configure this app: a plain file at `/var/www/lstu/lstu.conf` with SSH. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..9c5d939 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,3 @@ +## Configuration + +Comment configurer cette application : un fichier simple à `/var/www/lstu/lstu.conf` avec SSH. diff --git a/LSTU_screenshot.png b/doc/screenshots/LSTU_screenshot.png similarity index 100% rename from LSTU_screenshot.png rename to doc/screenshots/LSTU_screenshot.png diff --git a/manifest.json b/manifest.json index f37f2e3..9fc2577 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,13 @@ }, "version": "0.23-0~ynh1", "url": "https://lstu.fr", + "upstream": { + "license": "WTFPL", + "website": "https://lstu.fr", + "demo": "https://lstu.fr", + "admindoc": "https://framagit.org/fiat-tux/hat-softwares/lstu/wikis/home", + "code": "https://framagit.org/fiat-tux/hat-softwares/lstu" + }, "license": "WTFPL", "maintainer": { "name": "frju365", diff --git a/scripts/actions/change_password b/scripts/actions/change_password index 7c00784..dbd4551 100755 --- a/scripts/actions/change_password +++ b/scripts/actions/change_password @@ -49,7 +49,7 @@ ynh_app_setting_set $app hashed_password $hashed_password # RELOAD NGINX #================================================= -ynh_systemd_action -n $app -a reload -l "Reloaded Shortened URLs service." -p "systemd" +ynh_systemd_action --service_name=$app --action="reload" --log_path="systemd" --line_match="Server available at" #================================================= # END OF SCRIPT diff --git a/scripts/actions/change_theme b/scripts/actions/change_theme index b806867..6c72973 100755 --- a/scripts/actions/change_theme +++ b/scripts/actions/change_theme @@ -48,7 +48,7 @@ ynh_app_setting_set $app theme $theme # RELOAD NGINX #================================================= -ynh_systemd_action -n $app -a reload -l "Reloaded Shortened URLs service." -p "systemd" +ynh_systemd_action --service_name=$app --action="reload" --log_path="systemd" --line_match="Server available at" #================================================= # END OF SCRIPT diff --git a/scripts/actions/public_private b/scripts/actions/public_private index 72f7555..4091fa5 100755 --- a/scripts/actions/public_private +++ b/scripts/actions/public_private @@ -50,25 +50,12 @@ fi # MOVE TO PUBLIC OR PRIVATE #================================================= -ynh_backup_if_checksum_is_different "$final_path/lstu.conf" -cp conf/lstu.conf.template "${final_path}/lstu.conf" -ynh_replace_string "__DOMAIN__" "$domain" "${final_path}/lstu.conf" -ynh_replace_string "__PATH__" "$path_url" "${final_path}/lstu.conf" -ynh_replace_string "__PORT__" "$port" "${final_path}/lstu.conf" -ynh_replace_string "__DB_NAME__" "$db_name" "${final_path}/lstu.conf" -ynh_replace_string "__DB_USER__" "$db_user" "${final_path}/lstu.conf" -ynh_replace_string "__DB_PWD__" "$db_pwd" "${final_path}/lstu.conf" -ynh_replace_string "__SELECTED_THEME__" "$theme" "${final_path}/lstu.conf" -ynh_replace_string "__PASSWORD_HASHED__" "$hashed_password" "${final_path}/lstu.conf" - -ynh_replace_string "__SECRET__" "$secret" "${final_path}/lstu.conf" if [ $is_public -eq 0 ]; then - ynh_replace_string "__IS_PUBLIC__" "" "${final_path}/lstu.conf" + ynh_add_config --template="../conf/lstu.conf.ldap" --destination="$final_path/lstu.conf" else - ynh_replace_string "__IS_PUBLIC__" "#" "${final_path}/lstu.conf" + ynh_add_config --template="../conf/lstu.conf.template" --destination="$final_path/lstu.conf" fi -ynh_store_file_checksum "${final_path}/lstu.conf" if [ $is_public -eq 0 ]; then public_private="private" @@ -100,7 +87,7 @@ ynh_app_setting_set $app is_public $is_public # RELOAD NGINX #================================================= -ynh_systemd_action -n $app -a reload -l "Reloaded Shortened URLs service." -p "systemd" +ynh_systemd_action --service_name=$app --action="reload" --log_path="systemd" --line_match="Server available at" #================================================= # END OF SCRIPT