mirror of
https://github.com/YunoHost-Apps/pixelfed_ynh.git
synced 2024-09-03 20:06:04 +02:00
Merge branch 'testing' into systemd
This commit is contained in:
commit
29dd9c29ae
10 changed files with 17 additions and 60 deletions
|
@ -1,7 +1,7 @@
|
||||||
# All available README files by language
|
# All available README files by language
|
||||||
|
|
||||||
- [Read the README in English](README.md)
|
- [Read the README in English](README.md)
|
||||||
- [Lee el README en español](README_es.md)
|
- [Lea el README en español](README_es.md)
|
||||||
- [Irakurri README euskaraz](README_eu.md)
|
- [Irakurri README euskaraz](README_eu.md)
|
||||||
- [Lire le README en français](README_fr.md)
|
- [Lire le README en français](README_fr.md)
|
||||||
- [Le o README en galego](README_gl.md)
|
- [Le o README en galego](README_gl.md)
|
||||||
|
|
|
@ -5,7 +5,7 @@ It shall NOT be edited by hand.
|
||||||
|
|
||||||
# Pixelfed for YunoHost
|
# Pixelfed for YunoHost
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
|
||||||
|
|
||||||
It is also possible to import your data from Instagram.
|
It is also possible to import your data from Instagram.
|
||||||
|
|
||||||
**Shipped version:** 0.12.1~ynh1
|
**Shipped version:** 0.12.3~ynh1
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ No se debe editar a mano.
|
||||||
|
|
||||||
# Pixelfed para Yunohost
|
# Pixelfed para Yunohost
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
|
||||||
|
|
||||||
It is also possible to import your data from Instagram.
|
It is also possible to import your data from Instagram.
|
||||||
|
|
||||||
**Versión actual:** 0.12.1~ynh1
|
**Versión actual:** 0.12.3~ynh1
|
||||||
|
|
||||||
## Capturas
|
## Capturas
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ EZ editatu eskuz.
|
||||||
|
|
||||||
# Pixelfed YunoHost-erako
|
# Pixelfed YunoHost-erako
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
|
||||||
|
|
||||||
It is also possible to import your data from Instagram.
|
It is also possible to import your data from Instagram.
|
||||||
|
|
||||||
**Paketatutako bertsioa:** 0.12.1~ynh1
|
**Paketatutako bertsioa:** 0.12.3~ynh1
|
||||||
|
|
||||||
## Pantaila-argazkiak
|
## Pantaila-argazkiak
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
|
||||||
|
|
||||||
# Pixelfed pour YunoHost
|
# Pixelfed pour YunoHost
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,8 +25,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe
|
||||||
|
|
||||||
Il est également possible d'importer ses données depuis Instagram.
|
Il est également possible d'importer ses données depuis Instagram.
|
||||||
|
|
||||||
|
**Version incluse :** 0.12.3~ynh1
|
||||||
**Version incluse :** 0.12.1~ynh1
|
|
||||||
|
|
||||||
## Captures d’écran
|
## Captures d’écran
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ NON debe editarse manualmente.
|
||||||
|
|
||||||
# Pixelfed para YunoHost
|
# Pixelfed para YunoHost
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
|
||||||
|
|
||||||
It is also possible to import your data from Instagram.
|
It is also possible to import your data from Instagram.
|
||||||
|
|
||||||
**Versión proporcionada:** 0.12.1~ynh1
|
**Versión proporcionada:** 0.12.3~ynh1
|
||||||
|
|
||||||
## Capturas de pantalla
|
## Capturas de pantalla
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# YunoHost 上的 Pixelfed
|
# YunoHost 上的 Pixelfed
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/pixelfed)  
|
[](https://ci-apps.yunohost.org/ci/apps/pixelfed/)  
|
||||||
|
|
||||||
[](https://install-app.yunohost.org/?app=pixelfed)
|
[](https://install-app.yunohost.org/?app=pixelfed)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
|
||||||
|
|
||||||
It is also possible to import your data from Instagram.
|
It is also possible to import your data from Instagram.
|
||||||
|
|
||||||
**分发版本:** 0.12.1~ynh1
|
**分发版本:** 0.12.3~ynh1
|
||||||
|
|
||||||
## 截图
|
## 截图
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ name = "Pixelfed"
|
||||||
description.en = "ActivityPub Federated Image Sharing"
|
description.en = "ActivityPub Federated Image Sharing"
|
||||||
description.fr = "Logiciel de partage d'image fédéré via ActivityPub"
|
description.fr = "Logiciel de partage d'image fédéré via ActivityPub"
|
||||||
|
|
||||||
version = "0.12.1~ynh1"
|
version = "0.12.3~ynh1"
|
||||||
|
|
||||||
maintainers = ["yalh76", "Lapineige"]
|
maintainers = ["yalh76", "Lapineige"]
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/"
|
||||||
code = "https://github.com/pixelfed/pixelfed"
|
code = "https://github.com/pixelfed/pixelfed"
|
||||||
|
|
||||||
[integration]
|
[integration]
|
||||||
yunohost = ">= 11.2.4"
|
yunohost = ">= 11.2.12"
|
||||||
architectures = "all"
|
architectures = "all"
|
||||||
multi_instance = true
|
multi_instance = true
|
||||||
ldap = false
|
ldap = false
|
||||||
|
@ -36,8 +36,8 @@ ram.runtime = "100M"
|
||||||
|
|
||||||
[resources]
|
[resources]
|
||||||
[resources.sources.main]
|
[resources.sources.main]
|
||||||
url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.12.1.tar.gz"
|
url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.12.3.tar.gz"
|
||||||
sha256 = "dcfc497921ebc535245bff3a3aa1e6dbd774c65d3d26cf005caca999a20c28d6"
|
sha256 = "04c9c0528d7b315eb909a792ab4efccbc4314fb2a8ddfe9eefc5f500a97b2992"
|
||||||
autoupdate.strategy = "latest_github_tag"
|
autoupdate.strategy = "latest_github_tag"
|
||||||
|
|
||||||
[resources.system_user]
|
[resources.system_user]
|
||||||
|
|
|
@ -18,47 +18,6 @@ YNH_COMPOSER_VERSION="2.2.21"
|
||||||
# FUTURE OFFICIAL HELPERS
|
# FUTURE OFFICIAL HELPERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# get the first available redis database
|
|
||||||
#
|
|
||||||
# usage: ynh_redis_get_free_db
|
|
||||||
# | returns: the database number to use
|
|
||||||
ynh_redis_get_free_db() {
|
|
||||||
local result max db
|
|
||||||
result="$(redis-cli INFO keyspace)"
|
|
||||||
|
|
||||||
# get the num
|
|
||||||
max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
|
|
||||||
|
|
||||||
db=0
|
|
||||||
# default Debian setting is 15 databases
|
|
||||||
for i in $(seq 0 "$max")
|
|
||||||
do
|
|
||||||
if ! echo "$result" | grep -q "db$i"
|
|
||||||
then
|
|
||||||
db=$i
|
|
||||||
break 1
|
|
||||||
fi
|
|
||||||
db=-1
|
|
||||||
done
|
|
||||||
|
|
||||||
test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
|
|
||||||
|
|
||||||
echo "$db"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Create a master password and set up global settings
|
|
||||||
# Please always call this script in install and restore scripts
|
|
||||||
#
|
|
||||||
# usage: ynh_redis_remove_db database
|
|
||||||
# | arg: database - the database to erase
|
|
||||||
ynh_redis_remove_db() {
|
|
||||||
local db=$1
|
|
||||||
redis-cli -n "$db" flushdb
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#=================================================
|
|
||||||
|
|
||||||
|
|
||||||
# Create a dedicated supervisor config
|
# Create a dedicated supervisor config
|
||||||
#
|
#
|
||||||
|
|
|
@ -39,7 +39,6 @@ ynh_remove_fpm_config
|
||||||
ynh_secure_remove --file="/etc/cron.d/$app"
|
ynh_secure_remove --file="/etc/cron.d/$app"
|
||||||
|
|
||||||
# Remove the log files
|
# Remove the log files
|
||||||
ynh_secure_remove --file="/var/log/$app"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# END OF SCRIPT
|
# END OF SCRIPT
|
||||||
|
|
Loading…
Add table
Reference in a new issue