diff options
| author | yalh76 <yalh@yahoo.com> | 2022-02-19 14:51:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 14:51:21 +0100 |
| commit | 1398b224068b0bcc25efff2692279d4c8aca143e (patch) | |
| tree | 54ee0036971ace7f98f7d703179482daa2995f30 | |
| parent | 3f728834a15657f72efbef59d5991e03b5babb66 (diff) | |
| parent | ab638806758756ead67c96cf6deca470b16e7c56 (diff) | |
| download | mastodon_ynh-1398b224068b0bcc25efff2692279d4c8aca143e.tar.gz mastodon_ynh-1398b224068b0bcc25efff2692279d4c8aca143e.tar.bz2 mastodon_ynh-1398b224068b0bcc25efff2692279d4c8aca143e.zip | |
Merge pull request #310 from YunoHost-Apps/testing
better sidekiq
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_fr.md | 2 | ||||
| -rw-r--r-- | check_process | 4 | ||||
| -rw-r--r-- | conf/mastodon-sidekiq.service | 28 | ||||
| -rw-r--r-- | manifest.json | 2 |
5 files changed, 19 insertions, 19 deletions
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 3.4.6~ynh2 +**Shipped version:** 3.4.6~ynh3 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index bf67819..75f369b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse :** 3.4.6~ynh2 +**Version incluse :** 3.4.6~ynh3 **Démo :** https://joinmastodon.org/ diff --git a/check_process b/check_process index 61a81b8..3945bdc 100644 --- a/check_process +++ b/check_process @@ -13,9 +13,9 @@ setup_public=1 upgrade=1 # 3.4.1~ynh1 - upgrade=1 from_commit=efbdbb05350b820c6e59a7bbbf70f57cf679fff8 + #upgrade=1 from_commit=efbdbb05350b820c6e59a7bbbf70f57cf679fff8 # 3.4.1~ynh4 - upgrade=1 from_commit=adec07db890dec787416e1b7c4493d24391d3500 + #upgrade=1 from_commit=adec07db890dec787416e1b7c4493d24391d3500 # 3.4.4~ynh1 upgrade=1 from_commit=4d413848bf444586e28f3658de0ebe36d6ebf059 backup_restore=1 diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index 83c11e6..24554c1 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -19,15 +19,15 @@ StandardError=syslog # 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 +NoNewPrivileges=no +PrivateTmp=yes #PrivateDevices=yes #RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK #RestrictNamespaces=yes #RestrictRealtime=yes -#DevicePolicy=closed -#ProtectSystem=full -#ProtectControlGroups=yes +DevicePolicy=closed +ProtectSystem=full +ProtectControlGroups=yes #ProtectKernelModules=yes #ProtectKernelTunables=yes #LockPersonality=yes @@ -35,15 +35,15 @@ StandardError=syslog # 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 +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 diff --git a/manifest.json b/manifest.json index 03f1997..cce2547 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "3.4.6~ynh2", + "version": "3.4.6~ynh3", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", |