aboutsummaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/install')
-rw-r--r--scripts/install29
1 files changed, 18 insertions, 11 deletions
diff --git a/scripts/install b/scripts/install
index 0991cbc..1810c9b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -10,6 +10,8 @@ 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 ynh_check_ram
source /usr/share/yunohost/helpers
#=================================================
@@ -44,17 +46,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 [ "$admin" != "package_checker" ]
-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
@@ -135,6 +126,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
#=================================================
ynh_script_progression --message="Installing Ruby..." --weight=424