From fda1e85b14a6bec6fd7534c635fea6f0838b529c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 15 Aug 2024 08:35:56 +0200 Subject: [PATCH] fix --- conf/.env | 52 ------------------------------------------------- scripts/install | 5 ----- scripts/remove | 4 ---- scripts/restore | 2 -- scripts/upgrade | 4 ---- 5 files changed, 67 deletions(-) delete mode 100644 conf/.env diff --git a/conf/.env b/conf/.env deleted file mode 100644 index 72c62d9..0000000 --- a/conf/.env +++ /dev/null @@ -1,52 +0,0 @@ -# Redlib configuration -# See the Configuration section of the README for a more detailed explanation of these settings. - -# Instance-specific settings -# Enable SFW-only mode for the instance -REDLIB_SFW_ONLY=off -# Set a banner message for the instance -REDLIB_BANNER= -# Disable search engine indexing -REDLIB_ROBOTS_DISABLE_INDEXING=off -# Set the Pushshift frontend for "removed" links -REDLIB_PUSHSHIFT_FRONTEND=undelete.pullpush.io - -# Default user settings -# Set the default theme (options: system, light, dark, black, dracula, nord, laserwave, violet, gold, rosebox, gruvboxdark, gruvboxlight) -REDLIB_DEFAULT_THEME=system -# Set the default front page (options: default, popular, all) -REDLIB_DEFAULT_FRONT_PAGE=default -# Set the default layout (options: card, clean, compact) -REDLIB_DEFAULT_LAYOUT=card -# Enable wide mode by default -REDLIB_DEFAULT_WIDE=off -# Set the default post sort method (options: hot, new, top, rising, controversial) -REDLIB_DEFAULT_POST_SORT=hot -# Set the default comment sort method (options: confidence, top, new, controversial, old) -REDLIB_DEFAULT_COMMENT_SORT=confidence -# Enable blurring Spoiler content by default -REDLIB_DEFAULT_BLUR_SPOILER=off -# Enable showing NSFW content by default -REDLIB_DEFAULT_SHOW_NSFW=off -# Enable blurring NSFW content by default -REDLIB_DEFAULT_BLUR_NSFW=off -# Enable HLS video format by default -REDLIB_DEFAULT_USE_HLS=off -# Hide HLS notification by default -REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION=off -# Disable autoplay videos by default -REDLIB_DEFAULT_AUTOPLAY_VIDEOS=off -# Define a default list of subreddit subscriptions (format: sub1+sub2+sub3) -REDLIB_DEFAULT_SUBSCRIPTIONS= -# Define a default list of subreddit filters (format: sub1+sub2+sub3) -REDLIB_DEFAULT_FILTERS= -# Hide awards by default -REDLIB_DEFAULT_HIDE_AWARDS=off -# Hide sidebar and summary -REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY=off -# Disable the confirmation before visiting Reddit -REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION=off -# Hide score by default -REDLIB_DEFAULT_HIDE_SCORE=off -# Enable fixed navbar by default -REDLIB_DEFAULT_FIXED_NAVBAR=on \ No newline at end of file diff --git a/scripts/install b/scripts/install index 84fbe5c..8cbb255 100755 --- a/scripts/install +++ b/scripts/install @@ -8,10 +8,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" chmod +x $install_dir/redlib #================================================= @@ -19,10 +17,8 @@ chmod +x $install_dir/redlib #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Alternative to Reddit" --log="/var/log/$app/$app.log" @@ -42,7 +38,6 @@ chown $app:$app "$install_dir/redlib.conf" #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= diff --git a/scripts/remove b/scripts/remove index 098e9c9..ed34c62 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,21 +7,17 @@ source /usr/share/yunohost/helpers # REMOVE SYSTEM CONFIGURATIONS #================================================= # REMOVE SYSTEMD SERVICE - #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_hide_warnings yunohost service status $app >/dev/null then ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi -# Remove the dedicated systemd config ynh_config_remove_systemd -# Remove the dedicated NGINX config ynh_config_remove_nginx #================================================= diff --git a/scripts/restore b/scripts/restore index 7da6af8..c99b967 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9f91570..bde0b92 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,10 +15,8 @@ ynh_systemctl --service=$app --action="stop" --log_path="systemd" #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="redlib.conf" --full_replace -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" chmod +x $install_dir/redlib #================================================= @@ -26,10 +24,8 @@ chmod +x $install_dir/redlib #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Alternative to Reddit" --log="/var/log/$app/$app.log"