diff --git a/README.md b/README.md index 4f1b226..2689a36 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -A free and open source alternative Twitter front-end focused on privacy and performance. +Nitter is a free and open source alternative Twitter front-end focused on privacy and performance. Inspired by the Invidious project. ### Features @@ -31,7 +31,7 @@ Inspired by the Invidious project. - Mobile support (responsive design) -**Shipped version:** 2023.08.08~ynh1 +**Shipped version:** 2023.08.08~ynh2 **Demo:** https://nitter.net/ diff --git a/README_fr.md b/README_fr.md index 21475dd..4a63bd4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Nitter est une interface alternative pour Twitter qui est plus rapide que le sit - Support mobile (conception réactive) -**Version incluse :** 2023.08.08~ynh1 +**Version incluse :** 2023.08.08~ynh2 **Démo :** https://nitter.net/ diff --git a/doc/ADMIN.md b/doc/ADMIN.md index cf788a5..93a0f3b 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1 +1 @@ -Nitter config file is stored in `/var/www/nitter/nitter.conf` (for the first instance, subsequent installs will go in `nitter__2`, `nitter__3`, etc). Users can override the defaults and set custom settings at `https://__DOMAIN__/settings`. \ No newline at end of file +Nitter config file is stored in `__INSTALL_DIR__/nitter.conf`. Users can override the defaults and set custom settings at `https://__DOMAIN__/settings`. \ No newline at end of file diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index ad1f35f..abdb275 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1 +1 @@ -Le ficher de configuration de Nitter se trouve à `/var/www/nitter/nitter.conf` (pour la première installation, les prochaines installations iront dans `nitter__2`, `nitter__3`, etc). Les utilisateurs peuvent modifier les paramétres par défaut en visitant `https://__DOMAIN__/settings`. \ No newline at end of file +Le ficher de configuration de Nitter se trouve à `__INSTALL_DIR__/nitter.conf`. Les utilisateurs peuvent modifier les paramétres par défaut en visitant `https://__DOMAIN__/settings`. \ No newline at end of file diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 0b93808..d83f36f 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,4 +1,4 @@ -A free and open source alternative Twitter front-end focused on privacy and performance. +Nitter is a free and open source alternative Twitter front-end focused on privacy and performance. Inspired by the Invidious project. ### Features diff --git a/manifest.toml b/manifest.toml index 13a61d7..8d3ca94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nitter" description.en = "Alternative front-end for Twitter that respects your privacy" description.fr = "Interface alternative pour Twitter qui respecte votre vie privée" -version = "2023.08.08~ynh1" +version = "2023.08.08~ynh2" maintainers = ["Jules Bertholet"] @@ -20,8 +20,11 @@ code = "https://github.com/zedeus/nitter" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = true + disk = "50M" ram.build = "2000M" ram.runtime = "50M" @@ -64,6 +67,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/zedeus/nitter/tarball/d7ca353a55ea3440a2ec1f09155951210a374cc7" sha256 = "028ec2f9c93c9f65259d4a6632ee4a77d9b43516921f4e741e94cfcbb0530f4a" + autoupdate.strategy = "latest_github_commit" [resources.sources.nim] amd64.url = "https://nim-lang.org/download/nim-1.6.14-linux_x64.tar.xz" @@ -85,4 +89,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "acl nim libsass-dev" + packages = "acl, nim, libsass-dev" diff --git a/scripts/install b/scripts/install index 0f71e92..03945c8 100755 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,7 @@ set_permissions # Use logrotate to manage application logfile(s) ynh_use_logrotate -yunohost service add $app --description="Alternative front-end for Twitter that respects your privacy" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Alternative front-end for Twitter" --log="/var/log/$app/$app.log" #================================================= # ADD A CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 5b52d05..907a7c5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,7 +37,7 @@ systemctl enable $app.service --quiet ynh_use_logrotate --non-append ynh_restore_file --origin_path="/etc/logrotate.d/$app" -yunohost service add $app --description="Alternative front-end for Twitter that respects your privacy" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Alternative front-end for Twitter" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 021205b..190e6a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,14 +50,6 @@ fi chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # SPECIFIC UPGRADE #================================================= @@ -75,36 +67,23 @@ build_nitter #ynh_add_config --template="nitter.conf" --destination="$install_dir/nitter.conf" #================================================= -# SETUP SYSTEMD +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= +# Use logrotate to manage app-specific logfile(s) +ynh_use_logrotate --non-append # Set permissions on app files set_permissions -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 - -# Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append - -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Alternative front-end for Twitter that respects your privacy" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Alternative front-end for Twitter" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE