mirror of
https://github.com/YunoHost-Apps/ttrss_ynh.git
synced 2024-10-01 13:34:46 +02:00
Testing (#163)
* Auto-update README
* Upgrade to upstream
* Auto-update README
* Bullseye (#141)
* Fix
* Fix
* Auto-update README
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
* Upgrade
* Auto-update README
* Auto-update README
* Upgrade to upstream
* Auto-update README
* PHP
* Auto-update README
* Update manifest.json
* Auto-update README
* Update config
* Fix
* Auto-update README
* update
* Auto-update README
* Version 2 (#148)
* v2
* v2
* Auto-update README
* Fix
* Auto-update README
* fix
---------
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
* Update tests.toml
* Delete check_process
* Update restore
* Update remove
* Update install
* Update upgrade
* Fix
* Update upgrade
* Update manifest.toml
* Update manifest.toml
* data_migration
* fix
* Fix
* Update manifest.toml
* Auto-update README
* Update manifest.toml
* Update manifest.toml
* Auto-update README
* Update tests.toml
* auto updater
* Update manifest.toml
* Auto-update README
* remove data migration
* update git repo
* Auto-update README
* Update manifest.toml
* Update manifest.toml
* Auto-update README
* update to upstream
* Auto-update README
* fix
* Auto-update README
* Update manifest.toml
* Update manifest.toml
* Auto-update README
* Update manifest.toml
* Auto-update README
* PostgreSQL (#150)
* switch to PHP
* Update install
* Update _common.sh
* Update _common.sh
* Update app.src
* Update manifest.json
* Auto-update README
* Fix
* Update remove
* Update _common.sh
* Update app.src
* Fix
* Remove cron
* Update install
* Update change_url
* Update systemd.service
* Update install
* Update DESCRIPTION.md
* Auto-update README
* Fix
* Update manifest.json
* Update restore
* Update app.src
* Create migration
* v2
* v2
* Auto-update README
* Fix
* Auto-update README
* fix
* fix
* fix
* Update restore
* data_migration
* Revert "data_migration"
This reverts commit 1aea23fb52.
* fix
* fix
* Update manifest.toml
* Update manifest.toml
* Update manifest.toml
* Auto-update README
* fix
* Update manifest.toml
* Update manifest.toml
* Auto-update README
* Create PRE_UPGRADE_fr.md
* fix
* Auto-update README
* Auto-update README
* Update manifest.toml
* Auto-update README
---------
Co-authored-by: Yunohost-Bot <>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
* Update manifest.toml
* cleaning
* Email (#162)
* add email
* Update config.php
* Update systemd.service
* Update manifest.toml
* Auto-update README
* Update config.php
* Update config.php
---------
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
This commit is contained in:
eric_G
GitHub
parent
2e383748f9
commit
c4a792f573
9 changed files with 46 additions and 42 deletions
|
|
@ -28,7 +28,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an
|
|||
- flexible article filtering
|
||||
|
||||
|
||||
**Shipped version:** 20231202~ynh1
|
||||
**Shipped version:** 20231202~ynh2
|
||||
|
||||
**Demo:** https://srv.tt-rss.org/tt-rss/
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas
|
|||
- filtrage flexible des articles
|
||||
|
||||
|
||||
**Version incluse :** 20231202~ynh1
|
||||
**Version incluse :** 20231202~ynh2
|
||||
|
||||
**Démo :** https://srv.tt-rss.org/tt-rss/
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@
|
|||
// *********************************
|
||||
|
||||
putenv('TTRSS_SMTP_FROM_NAME=Tiny Tiny RSS');
|
||||
putenv('TTRSS_SMTP_FROM_ADDRESS=noreply@your.domain.dom');
|
||||
putenv('TTRSS_SMTP_FROM_ADDRESS=noreply@__DOMAIN__');
|
||||
// Name, address and subject for sending outgoing mail. This applies
|
||||
// to password reset notifications, digest emails and any other mail.
|
||||
|
||||
|
|
@ -145,8 +145,8 @@
|
|||
// Hostname:port combination to send outgoing mail (i.e. localhost:25).
|
||||
// Blank - use system MTA.
|
||||
|
||||
putenv('TTRSS_SMTP_LOGIN=');
|
||||
putenv('TTRSS_SMTP_PASSWORD=');
|
||||
putenv('TTRSS_SMTP_LOGIN=__APP__');
|
||||
putenv('TTRSS_SMTP_PASSWORD=__MAIL_PWD__');
|
||||
// These two options enable SMTP authentication when sending
|
||||
// outgoing mail. Only used with SMTP_SERVER.
|
||||
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
// if you experience weird errors and tt-rss failing to start, blank pages
|
||||
// after login, or content encoding errors, disable it.
|
||||
|
||||
putenv('TTRSS_PLUGINS=auth_internal, note, data_migration');
|
||||
putenv('TTRSS_PLUGINS=auth_internal, note');
|
||||
// Comma-separated list of plugins to load automatically for all users.
|
||||
// System plugins have to be specified here. Please enable at least one
|
||||
// authentication plugin here (auth_*).
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# OPML import/export (including filters and some settings). Must be done before data_migration plugin if you want to keep feed categories
|
||||
|
||||
# on the original machine
|
||||
sudo mkdir /var/www/tt-rss/export
|
||||
sudo chown -R www-data:www-data /var/www/tt-rss/export/
|
||||
sudo -u www-data php /var/www/tt-rss/update.php --opml-export "MYUSERNAME /var/www/tt-rss/export/export-2020-08-07.opml" # export feeds OPML
|
||||
# on a client
|
||||
rsync -avP my.original.machine.org:/var/www/tt-rss/export/export-2020-08-07.opml ./ # download opml export
|
||||
# login to the new tt-rss instance from a browser, go to Preferences > Feeds, import OPML file
|
||||
|
||||
# migrate all articles from mysql to postgresql
|
||||
# on the original machine
|
||||
git clone https://git.tt-rss.org/fox/ttrss-data-migration
|
||||
sudo chown -R root:www-data ttrss-data-migration/
|
||||
sudo mv ttrss-data-migration/ /var/www/tt-rss/plugins.local/data_migration
|
||||
sudo nano /var/www/tt-rss/config.php # enable data_migration in the PLUGINS array
|
||||
sudo -u www-data php /var/www/tt-rss/update.php --data_user MYUSERNAME --data_export /var/www/tt-rss/export/export-2020-08-07.zip # export articles to database-agnostic format
|
||||
|
||||
# on the target machine
|
||||
git clone https://git.tt-rss.org/fox/ttrss-data-migration
|
||||
sudo chown -R root:www-data ttrss-data-migration/
|
||||
sudo mv ttrss-data-migration/ /var/www/rss.example.org/plugins.local/data_migration
|
||||
sudo nano /var/www/rss.example.org/config.php # enable data_migration in the PLUGINS array
|
||||
rsync -avP my.original.machine.org:/var/www/tt-rss/export/export-2020-08-07.zip ./
|
||||
sudo mkdir /var/www/rss.example.org/export
|
||||
sudo mv export-2020-08-07.zip /var/www/rss.example.org/export
|
||||
sudo chown -R root:www-data /var/www/rss.example.org/export
|
||||
sudo chmod -R g+rX /var/www/rss.example.org/export/
|
||||
sudo -u www-data php /var/www/rss.example.org/update.php --data_user MYUSERNAME --data_import /var/www/rss.example.org/export/export-2020-08-07.zip # it can take a while
|
||||
sudo rm -r /var/www/rss.example.org/export/ # cleanup
|
||||
|
|
@ -10,5 +10,40 @@ ExecStart=/usr/bin/php__PHPVERSION__ __INSTALL_DIR__/update_daemon2.php
|
|||
Restart=always
|
||||
RestartSec=10
|
||||
|
||||
|
||||
# Sandboxing options to harden security
|
||||
# Depending on specificities of your service/app, you may need to tweak these
|
||||
# .. but this should be a good baseline
|
||||
# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
|
||||
NoNewPrivileges=yes
|
||||
PrivateTmp=yes
|
||||
PrivateDevices=yes
|
||||
RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
|
||||
RestrictNamespaces=yes
|
||||
RestrictRealtime=yes
|
||||
DevicePolicy=closed
|
||||
ProtectClock=yes
|
||||
ProtectHostname=yes
|
||||
ProtectProc=invisible
|
||||
ProtectSystem=full
|
||||
ProtectControlGroups=yes
|
||||
ProtectKernelModules=yes
|
||||
ProtectKernelTunables=yes
|
||||
LockPersonality=yes
|
||||
SystemCallArchitectures=native
|
||||
SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap @cpu-emulation @privileged
|
||||
|
||||
# Denying access to capabilities that should not be relevant for webapps
|
||||
# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
|
||||
CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
|
||||
CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
|
||||
CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
|
||||
CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
|
||||
CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
|
||||
CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
|
||||
CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
|
||||
CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
|
||||
CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ name = "Tiny Tiny RSS"
|
|||
description.en = "News feed (RSS/Atom) reader and aggregator"
|
||||
description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom"
|
||||
|
||||
version = "20231202~ynh1"
|
||||
version = "20231202~ynh2"
|
||||
|
||||
maintainers = []
|
||||
|
||||
|
|
@ -47,6 +47,7 @@ ram.runtime = "50M"
|
|||
sha256 = "72ec560bd5ad7bac4789d7af0e5c2d7c1c394e9c540d46d5421ecae219d8f875"
|
||||
|
||||
[resources.system_user]
|
||||
allow_email = true
|
||||
|
||||
[resources.install_dir]
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1
|
|||
|
||||
domain_path="https://${new_domain}${new_path}"
|
||||
domain="$new_domain"
|
||||
ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
|
||||
ynh_add_config --template="config.php" --destination="$install_dir/config.php"
|
||||
|
||||
chmod 400 "$install_dir/config.php"
|
||||
chown $app "$install_dir/config.php"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ ynh_script_progression --message="Setting up source files..." --weight=7
|
|||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir"
|
||||
#ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration"
|
||||
echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt"
|
||||
|
||||
chmod -R o-rwx "$install_dir"
|
||||
|
|
@ -47,7 +46,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
|
|||
|
||||
domain_path=https://$domain$path
|
||||
|
||||
ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
|
||||
ynh_add_config --template="config.php" --destination="$install_dir/config.php"
|
||||
|
||||
chmod 400 "$install_dir/config.php"
|
||||
chown $app "$install_dir/config.php"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ then
|
|||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir"
|
||||
#ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration"
|
||||
echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt"
|
||||
fi
|
||||
|
||||
|
|
@ -77,7 +76,7 @@ then
|
|||
ynh_script_progression --message="Updating a configuration file..." --weight=2
|
||||
|
||||
domain_path=https://$domain$path
|
||||
ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
|
||||
ynh_add_config --template="config.php" --destination="$install_dir/config.php"
|
||||
|
||||
ynh_script_progression --message="Upgrading the database..." --weight=2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue