eric_G
GitHub
commit
c9f62ebbf1
11 changed files with 14 additions and 146 deletions
|
|
@ -12,7 +12,7 @@ Libre and federated social network
|
|||
|
||||
[](https://joinmastodon.org/)
|
||||
[](https://joinmastodon.org/)
|
||||
[?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
|
||||
[?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
|
||||
|
||||
<div align="center">
|
||||
<a href="https://apps.yunohost.org/app/mastodon"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,6 @@ location / {
|
|||
|
||||
proxy_set_header Accept-Encoding "";
|
||||
try_files $uri @proxy;
|
||||
|
||||
# Include SSOWAT user panel.
|
||||
include conf.d/yunohost_panel.conf.inc;
|
||||
}
|
||||
|
||||
location ~ /sw.js {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ name = "Mastodon"
|
|||
description.en = "Libre and federated social network"
|
||||
description.fr = "Réseau social libre et fédéré"
|
||||
|
||||
version = "4.4.4~ynh1"
|
||||
version = "4.4.5~ynh1"
|
||||
|
||||
maintainers = []
|
||||
|
||||
|
|
@ -52,8 +52,8 @@ ram.runtime = "500M"
|
|||
[resources]
|
||||
[resources.sources]
|
||||
[resources.sources.main]
|
||||
url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.4.4.tar.gz"
|
||||
sha256 = "1df58eec7da0c47767493ec3ec3ec2225a0bcca94871d1d6615ee324aaed91ba"
|
||||
url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.4.5.tar.gz"
|
||||
sha256 = "add9ee5caae722549a2f7ed2129ecaed0945a1b2f942afbdbb7bd8ab73961fe6"
|
||||
autoupdate.strategy = "latest_github_release"
|
||||
|
||||
[resources.sources.redis_migration]
|
||||
|
|
@ -67,7 +67,8 @@ ram.runtime = "500M"
|
|||
allow_email = true
|
||||
|
||||
[resources.install_dir]
|
||||
|
||||
group = "www-data:r-x"
|
||||
|
||||
[resources.permissions]
|
||||
main.url = "/"
|
||||
|
||||
|
|
@ -86,3 +87,9 @@ ram.runtime = "500M"
|
|||
|
||||
[resources.database]
|
||||
type = "postgresql"
|
||||
|
||||
[resources.nodejs]
|
||||
version = "22"
|
||||
|
||||
[resources.ruby]
|
||||
version = "3.4.5"
|
||||
|
|
|
|||
|
|
@ -5,5 +5,3 @@
|
|||
#=================================================
|
||||
|
||||
memory_needed="2560"
|
||||
ruby_version="3.4.5"
|
||||
nodejs_version="22"
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ ynh_backup "$install_dir"
|
|||
|
||||
ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC BACKUP
|
||||
#=================================================
|
||||
# BACKUP LOGROTATE
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -1,21 +1,12 @@
|
|||
#!/bin/bash
|
||||
|
||||
source _common.sh
|
||||
source ynh_add_swap
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
|
||||
# Set `service` settings to support `yunohost app shell` command
|
||||
ynh_app_setting_set --key=service --value="$app-web.service"
|
||||
|
||||
#=================================================
|
||||
# INSTALL DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression "Installing Ruby and NodeJS..."
|
||||
|
||||
ynh_ruby_install
|
||||
ynh_nodejs_install
|
||||
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
source _common.sh
|
||||
source ynh_add_swap
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
#=================================================
|
||||
|
|
@ -36,10 +35,6 @@ ynh_safe_rm "/etc/cron.d/$app"
|
|||
# Remote logrotate config
|
||||
ynh_config_remove_logrotate
|
||||
|
||||
# Remove metapackage and its dependencies
|
||||
ynh_ruby_remove
|
||||
ynh_nodejs_remove
|
||||
|
||||
# Remove swap
|
||||
ynh_del_swap
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
|
||||
source ../settings/scripts/_common.sh
|
||||
source ../settings/scripts/ynh_add_swap
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
#=================================================
|
||||
|
|
@ -37,14 +36,6 @@ ynh_script_progression "Adding $swap_needed Mo to swap..."
|
|||
|
||||
ynh_add_swap --size=$swap_needed
|
||||
|
||||
#=================================================
|
||||
# REINSTALL DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression "Reinstalling Ruby and NodeJS..."
|
||||
|
||||
ynh_ruby_install
|
||||
ynh_nodejs_install
|
||||
|
||||
#=================================================
|
||||
# BUILD APP
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
source _common.sh
|
||||
source ynh_add_swap
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
config="$install_dir/live/.env.production"
|
||||
|
|
@ -46,14 +45,6 @@ fi
|
|||
ynh_script_progression "Adding $swap_needed Mo to swap..."
|
||||
ynh_add_swap --size=$swap_needed
|
||||
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression "Upgrading Ruby and NodeJS..."
|
||||
|
||||
ynh_ruby_install
|
||||
ynh_nodejs_install
|
||||
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Add swap
|
||||
#
|
||||
# usage: ynh_add_swap --size=SWAP in Mb
|
||||
# | arg: -s, --size= - Amount of SWAP to add in Mb.
|
||||
ynh_add_swap () {
|
||||
# Declare an array to define the options of this helper.
|
||||
declare -Ar args_array=( [s]=size= )
|
||||
local size
|
||||
# Manage arguments with getopts
|
||||
ynh_handle_getopts_args "$@"
|
||||
|
||||
local swap_max_size=$(( $size * 1024 ))
|
||||
|
||||
local free_space=$(df --output=avail / | sed 1d)
|
||||
# Because we don't want to fill the disk with a swap file, divide by 2 the available space.
|
||||
local usable_space=$(( $free_space / 2 ))
|
||||
|
||||
SD_CARD_CAN_SWAP=${SD_CARD_CAN_SWAP:-0}
|
||||
|
||||
# Can't swap inside an LXD
|
||||
if [ "$(systemd-detect-virt)" == "lxc" ]
|
||||
then
|
||||
ynh_print_warn "You are inside a LXC container, swap will not be added, but that can cause troubles for the app $app. Please make sure you have more than 2.5G available RAM."
|
||||
return
|
||||
fi
|
||||
|
||||
# Swap on SD card only if it's is specified
|
||||
if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ]
|
||||
then
|
||||
ynh_print_warn "The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'"
|
||||
return
|
||||
fi
|
||||
|
||||
# Compare the available space with the size of the swap.
|
||||
# And set a acceptable size from the request
|
||||
if [ $usable_space -ge $swap_max_size ]
|
||||
then
|
||||
local swap_size=$swap_max_size
|
||||
elif [ $usable_space -ge $(( $swap_max_size / 2 )) ]
|
||||
then
|
||||
local swap_size=$(( $swap_max_size / 2 ))
|
||||
elif [ $usable_space -ge $(( $swap_max_size / 3 )) ]
|
||||
then
|
||||
local swap_size=$(( $swap_max_size / 3 ))
|
||||
elif [ $usable_space -ge $(( $swap_max_size / 4 )) ]
|
||||
then
|
||||
local swap_size=$(( $swap_max_size / 4 ))
|
||||
else
|
||||
echo "Not enough space left for a swap file" >&2
|
||||
local swap_size=0
|
||||
fi
|
||||
|
||||
# If there's enough space for a swap, and no existing swap here
|
||||
if [ $swap_size -ne 0 ] && [ ! -e /swap_$app ]
|
||||
then
|
||||
# Preallocate space for the swap file, fallocate may sometime not be used, use dd instead in this case
|
||||
if ! fallocate -l ${swap_size}K /swap_$app
|
||||
then
|
||||
dd if=/dev/zero of=/swap_$app bs=1024 count=${swap_size}
|
||||
fi
|
||||
chmod 0600 /swap_$app
|
||||
# Create the swap
|
||||
mkswap /swap_$app
|
||||
# And activate it
|
||||
swapon /swap_$app
|
||||
# Then add an entry in fstab to load this swap at each boot.
|
||||
echo -e "/swap_$app swap swap defaults 0 0 #Swap added by $app" >> /etc/fstab
|
||||
fi
|
||||
}
|
||||
|
||||
ynh_del_swap () {
|
||||
# If there a swap at this place
|
||||
if [ -e /swap_$app ]
|
||||
then
|
||||
# Clean the fstab
|
||||
sed -i "/#Swap added by $app/d" /etc/fstab
|
||||
# Desactive the swap file
|
||||
swapoff /swap_$app
|
||||
# And remove it
|
||||
rm /swap_$app
|
||||
fi
|
||||
}
|
||||
|
||||
# Check if the device of the main mountpoint "/" is an SD card
|
||||
#
|
||||
# [internal]
|
||||
#
|
||||
# return 0 if it's an SD card, else 1
|
||||
ynh_is_main_device_a_sd_card () {
|
||||
local main_device=$(lsblk --output PKNAME --noheadings $(findmnt / --nofsroot --uniq --output source --noheadings --first-only))
|
||||
|
||||
if echo $main_device | grep --quiet "mmc" && [ $(tail -n1 /sys/block/$main_device/queue/rotational) == "0" ]
|
||||
then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
|
@ -21,5 +21,5 @@ test_format = 1.0
|
|||
# Commits to test upgrade from
|
||||
# -------------------------------
|
||||
|
||||
#test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1"
|
||||
test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1"
|
||||
#test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1"
|
||||
test_upgrade_from.c2e28fb47626fca1b6fbd00796a94f5f290435d2.name = "4.4.4~ynh1"
|
||||
Loading…
Reference in a new issue