From 1e9663438eb0dd3535ced7086547a0da62bdaad2 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 11 Aug 2019 00:20:48 +0200
Subject: managing swap

---
 scripts/install | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'scripts/install')

diff --git a/scripts/install b/scripts/install
index 5bc5c23..daa4153 100644
--- a/scripts/install
+++ b/scripts/install
@@ -10,6 +10,7 @@ source _common.sh
 source ynh_install_ruby
 source ynh_add_extra_apt_repos__3
 source ynh_send_readme_to_admin__2
+source ynh_add_swap
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -44,16 +45,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
 
-if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	# TODO : to be factorized into a helper someday ? ;)
-	MEM=$(free | grep "^Mem"  | awk '{print $2}')
-	SWAP=$(free | grep "^Swap" | awk '{print $2}')
-	TOTAL_MEM_AND_SWAP=$(( ( $MEM+$SWAP ) / 1024 )) # In MB
-
-	[[ $TOTAL_MEM_AND_SWAP -gt 2500 ]] || ynh_die "You need at least 2500 Mo of RAM+Swap to install Mastodon. Please consult the README to learn how to add swap."
-
-fi
-
 # Register (book) web path
 ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
@@ -133,6 +124,22 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 
 #=================================================
 # SPECIFIC SETUP
+#=================================================
+# ADD SWAP IF NEEDED
+#=================================================
+
+total_memory=$(ynh_check_ram)
+total_swap=$(ynh_check_ram --only_swap)
+swap_needed=0
+
+if [ $total_memory -lt 2560 ]; then
+	# Need a minimum of 8Go of memory
+	swap_needed=$((2560 - $total_memory))
+fi
+
+ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1
+ynh_add_swap --size=$swap_needed
+
 #=================================================
 # INSTALLING RUBY AND BUNDLER
 #=================================================
-- 
cgit v1.2.3-70-g09d2


From d406a87de2856be91b82005517106bab0622d28b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 11 Aug 2019 01:40:06 +0200
Subject: fix ynh_check_ram

---
 scripts/install       |  1 +
 scripts/ynh_check_ram | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 scripts/ynh_check_ram

(limited to 'scripts/install')

diff --git a/scripts/install b/scripts/install
index daa4153..1810c9b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -11,6 +11,7 @@ source ynh_install_ruby
 source ynh_add_extra_apt_repos__3
 source ynh_send_readme_to_admin__2
 source ynh_add_swap
+source ynh_check_ram
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/ynh_check_ram b/scripts/ynh_check_ram
new file mode 100644
index 0000000..11012a3
--- /dev/null
+++ b/scripts/ynh_check_ram
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Check the amount of available RAM
+#
+# usage: ynh_check_ram [--required=RAM required in Mb] [--no_swap|--only_swap] [--free_ram]
+# | arg: -r, --required= - Amount of RAM required in Mb. The helper will return 0 is there's enough RAM, or 1 otherwise.
+# If --required isn't set, the helper will print the amount of RAM, in Mb.
+# | arg: -s, --no_swap   - Ignore swap
+# | arg: -o, --only_swap - Ignore real RAM, consider only swap.
+# | arg: -f, --free_ram  - Count only free RAM, not the total amount of RAM available.
+ynh_check_ram () {
+	# Declare an array to define the options of this helper.
+	declare -Ar args_array=( [r]=required= [s]=no_swap [o]=only_swap [f]=free_ram )
+	local required
+	local no_swap
+	local only_swap
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	required=${required:-}
+	no_swap=${no_swap:-0}
+	only_swap=${only_swap:-0}
+
+	local total_ram=$(vmstat --stats --unit M | grep "total memory" | awk '{print $1}')
+	local total_swap=$(vmstat --stats --unit M | grep "total swap" | awk '{print $1}')
+	local total_ram_swap=$(( total_ram + total_swap ))
+
+	local free_ram=$(vmstat --stats --unit M | grep "free memory" | awk '{print $1}')
+	local free_swap=$(vmstat --stats --unit M | grep "free swap" | awk '{print $1}')
+	local free_ram_swap=$(( free_ram + free_swap ))
+
+	# Use the total amount of ram
+	local ram=$total_ram_swap
+	if [ $free_ram -eq 1 ]
+	then
+		# Use the total amount of free ram
+		ram=$free_ram_swap
+		if [ $no_swap -eq 1 ]
+		then
+			# Use only the amount of free ram
+			ram=$free_ram
+		elif [ $only_swap -eq 1 ]
+		then
+			# Use only the amount of free swap
+			ram=$free_swap
+		fi
+	else
+		if [ $no_swap -eq 1 ]
+		then
+			# Use only the amount of free ram
+			ram=$total_ram
+		elif [ $only_swap -eq 1 ]
+		then
+			# Use only the amount of free swap
+			ram=$total_swap
+		fi
+	fi
+
+	if [ -n "$required" ]
+	then
+		# Return 1 if the amount of ram isn't enough.
+		if [ $ram -lt $required ]
+		then
+			return 1
+		else
+			return 0
+		fi
+
+	# If no RAM is required, return the amount of available ram.
+	else
+		echo $ram
+	fi
+}
-- 
cgit v1.2.3-70-g09d2