1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/thelounge_ynh.git synced 2024-09-03 20:35:54 +02:00

cleaning up

This commit is contained in:
ericgaspar 2020-05-29 22:51:48 +02:00
parent 5535e7b78a
commit 131be3a554
No known key found for this signature in database
GPG key ID: 574F281483054D44
7 changed files with 45 additions and 52 deletions

View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# nodejs version # nodejs version
nodejs_version="12" nodejs_version=12
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

View file

@ -31,7 +31,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
# BACKUP THE APP MAIN DIR # BACKUP THE APP MAIN DIR
#================================================= #=================================================
ynh_backup --src_path="$final_path" ynh_backup --src_path=$final_path
#================================================= #=================================================
# BACKUP THE NGINX CONFIGURATION # BACKUP THE NGINX CONFIGURATION
@ -55,7 +55,7 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
# BACKUP CONFIG # BACKUP CONFIG
#================================================= #=================================================
ynh_backup --src_path="$config_path" ynh_backup --src_path=$config_path
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

View file

@ -53,7 +53,7 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
#================================================= #=================================================
# MODIFY URL IN NGINX CONF # MODIFY URL IN NGINX CONF
@ -91,7 +91,7 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX

View file

@ -43,10 +43,10 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder"
path_url=$(ynh_normalize_url_path $path_url) path_url=$(ynh_normalize_url_path $path_url)
# Check web path availability # Check web path availability
ynh_webpath_available "$domain" "$path_url" ynh_webpath_available --app=$app --domain=$domain --path_url=$path_url
# Register (book) web path # Register (book) web path
ynh_webpath_register "$app" "$domain" "$path_url" ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#================================================= #=================================================
# FIND AND OPEN A PORT # FIND AND OPEN A PORT
@ -56,18 +56,18 @@ ynh_script_progression --message="Configuring firewall..."
# Find a free port # Find a free port
port=$(ynh_find_port 9000) port=$(ynh_find_port 9000)
ynh_app_setting_set --app="$app" --key="port" --value="$port" ynh_app_setting_set --app=$app --key=port --value=$port
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
#================================================= #=================================================
ynh_script_progression --message="Storing installation settings..." ynh_script_progression --message="Storing installation settings..."
ynh_app_setting_set --app="$app" --key="domain" --value="$domain" 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=path --value=$path_url
ynh_app_setting_set --app="$app" --key="is_public" --value="$is_public" ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app="$app" --key="final_path" --value="$final_path" ynh_app_setting_set --app=$app --key=final_path --value=$final_path
ynh_app_setting_set --app="$app" --key="config_path" --value="$config_path" ynh_app_setting_set --app=$app --key=config_path --value=$config_path
#================================================= #=================================================
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
@ -75,7 +75,7 @@ ynh_app_setting_set --app="$app" --key="config_path" --value="$config_path"
ynh_script_progression --message="Installing dependencies..." ynh_script_progression --message="Installing dependencies..."
# Install Nodejs # Install Nodejs
ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
# Install Yarn # Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
@ -85,12 +85,12 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
#================================================= #=================================================
ynh_script_progression --message="Setting up source files..." ynh_script_progression --message="Setting up source files..."
mkdir -p "$final_path" mkdir -p $final_path
mkdir -p "$config_path" mkdir -p $config_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir=$final_path
#================================================= #=================================================
# COPY A CONFIG FILE # COPY A CONFIG FILE
@ -108,7 +108,7 @@ ynh_store_file_checksum "$config_path/config.js"
#================================================= #=================================================
ynh_script_progression --message="Installing The Lounge..." ynh_script_progression --message="Installing The Lounge..."
pushd "$final_path" pushd $final_path
yarn install && ynh_exec_warn_less NODE_ENV=production yarn build yarn install && ynh_exec_warn_less NODE_ENV=production yarn build
@ -120,7 +120,7 @@ popd
ynh_script_progression --message="Configuring system user..." ynh_script_progression --message="Configuring system user..."
# Create a system user # Create a system user
ynh_system_user_create "$app" ynh_system_user_create --username=$app
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -142,7 +142,7 @@ ynh_replace_string --match_string="__NODE__" --replace_string="$nodejs_path
ynh_add_systemd_config ynh_add_systemd_config
yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" yunohost service add $app --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
@ -151,8 +151,8 @@ yunohost service add "$app" --description "Self-hosted web IRC client" --log "/v
#================================================= #=================================================
# Set permissions to app files # Set permissions to app files
chown -R "$app": "$final_path" chown -R $app: $final_path
chown -R "$app": "$config_path" chown -R $app: $config_path
#================================================= #=================================================
# SETUP LOGROTATE # SETUP LOGROTATE
@ -168,22 +168,15 @@ ynh_use_logrotate
ynh_script_progression --message="Starting a systemd service..." ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service # Start a systemd service
ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
ynh_script_progression --message="Configuring SSOwat..." ynh_script_progression --message="Configuring SSOwat..."
# 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 # Make app public if necessary or protect it
[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" [ $is_public -eq 1 ] || ynh_permission_update --permission "main" --add "visitors"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX

View file

@ -31,7 +31,7 @@ config_path=$(ynh_app_setting_get --app=$app --key=config_path)
if ynh_exec_warn_less yunohost service status $app >/dev/null if ynh_exec_warn_less yunohost service status $app >/dev/null
then then
ynh_script_progression --message="Removing $app service..." ynh_script_progression --message="Removing $app service..."
yunohost service remove "$app" yunohost service remove $app
fi fi
#================================================= #=================================================
@ -56,9 +56,9 @@ ynh_remove_nodejs
ynh_script_progression --message="Removing $app main directory..." ynh_script_progression --message="Removing $app main directory..."
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove --file="$final_path" ynh_secure_remove --file=$final_path
ynh_secure_remove --file="$config_path" ynh_secure_remove --file=$config_path
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE NGINX CONFIGURATION
@ -84,7 +84,7 @@ ynh_remove_logrotate
ynh_script_progression --message="Removing the dedicated system user..." ynh_script_progression --message="Removing the dedicated system user..."
# Delete a system user # Delete a system user
ynh_system_user_delete --username="$app" ynh_system_user_delete --username=$app
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

View file

@ -55,7 +55,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
ynh_script_progression --message="Restoring the app main directory..." ynh_script_progression --message="Restoring the app main directory..."
ynh_restore_file --origin_path="$final_path" ynh_restore_file --origin_path=$final_path
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
@ -63,7 +63,7 @@ ynh_restore_file --origin_path="$final_path"
ynh_script_progression --message="Recreating the dedicated system user..." ynh_script_progression --message="Recreating the dedicated system user..."
# Create the dedicated user (if not existing) # Create the dedicated user (if not existing)
ynh_system_user_create --username="$app" ynh_system_user_create --username=$app
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
@ -73,7 +73,7 @@ ynh_system_user_create --username="$app"
ynh_script_progression --message="Reinstalling dependencies..." ynh_script_progression --message="Reinstalling dependencies..."
# Install Nodejs # Install Nodejs
ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
# Install Yarn # Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
@ -83,7 +83,7 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
#================================================= #=================================================
ynh_script_progression --message="Restoring the config path..." ynh_script_progression --message="Restoring the config path..."
ynh_restore_file --origin_path="$config_path" ynh_restore_file --origin_path=$config_path
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD
@ -105,7 +105,7 @@ yunohost service add $app --log "/var/log/$app/$app.log"
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
#================================================= #=================================================
# RESTORE THE LOGROTATE CONFIGURATION # RESTORE THE LOGROTATE CONFIGURATION
@ -118,8 +118,8 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
#================================================= #=================================================
# Restore permissions to app files # Restore permissions to app files
chown -R "$app": "$final_path" chown -R $app: $final_path
chown -R "$app": "$config_path" chown -R $app: $config_path
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

View file

@ -83,7 +83,7 @@ path_url=$(ynh_normalize_url_path $path_url)
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -93,10 +93,10 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." ynh_script_progression --message="Upgrading source files..."
ynh_secure_remove --file="$final_path" ynh_secure_remove --file=$final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir=$final_path
fi fi
#================================================= #=================================================
@ -114,7 +114,7 @@ cp -a ../conf/config.js "$config_path"
ynh_script_progression --message="Upgrading dependencies..." ynh_script_progression --message="Upgrading dependencies..."
# Install Nodejs # Install Nodejs
ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
# Install Yarn # Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
@ -125,7 +125,7 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
pushd "$final_path" pushd $final_path
yarn install && ynh_exec_warn_less NODE_ENV=production yarn build yarn install && ynh_exec_warn_less NODE_ENV=production yarn build
@ -146,7 +146,7 @@ ynh_add_nginx_config
ynh_script_progression --message="Making sure dedicated system user exists..." ynh_script_progression --message="Making sure dedicated system user exists..."
# Create a system user # Create a system user
ynh_system_user_create --username="$app" ynh_system_user_create --username=$app
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
@ -160,7 +160,7 @@ ynh_replace_string --match_string="__NODE__" --replace_string="$nodejs_path
ynh_add_systemd_config ynh_add_systemd_config
yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" yunohost service add $app --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log"
#================================================= #=================================================
# STORE THE CONFIG FILE CHECKSUM # STORE THE CONFIG FILE CHECKSUM
@ -190,15 +190,15 @@ ynh_use_logrotate --non-append
#================================================= #=================================================
# Set right permissions for curl installation # Set right permissions for curl installation
chown -R "$app": "$final_path" chown -R $app: $final_path
chown -R "$app": "$config_path" chown -R $app: $config_path
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX