From 1162166f9564010103459fe48735094d1881a60b Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 6 Nov 2018 09:03:28 +0100 Subject: [PATCH 1/4] [refactor] App --- scripts/install | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/scripts/install b/scripts/install index 7c62983..1e26185 100644 --- a/scripts/install +++ b/scripts/install @@ -92,7 +92,20 @@ curl -sL https://deb.nodesource.com/setup_8.x | sudo bash - #============================================== ynh_package_update -ynh_install_app_dependencies postgresql +ynh_install_app_dependencies postgresql redis-server rabbitmq-server nginx-extras apt-transport-https + +#================================================= +# INSTALL NODEJS +#================================================= +# Use Helper instead of package from tthe repo +ynh_install_nodejs 8 + +#=============================================== +# ADD ONLYOFFCE REPOSITORY +#=============================================== + +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 +echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list #============================================== # CREATE DB @@ -102,33 +115,12 @@ sudo -i -u postgres psql -c "CREATE DATABASE onlyoffice;" sudo -i -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';" sudo -i -u postgres psql -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;" -#============================================== -# INSTALL REDIS & RABBITMQ -#============================================== - -ynh_install_app_dependencies redis-server rabbitmq-server - -#============================================== -# INSTALL NPM -#============================================== - -ynh_install_app_dependencies npm nginx-extras - #============================================== # DEFINE PORT #============================================== echo onlyoffice-documentserver onlyoffice/ds-port select 9980 | sudo debconf-set-selections -#=============================================== -# ADD ONLYOFFCE REPOSITORY -#=============================================== - -ynh_install_app_dependencies apt-transport-https -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 - -echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list - #============================================== # INSTALL ONLYOFFICE #============================================== From 87fe14a634578fa60d07c9ca75cb34ea14676182 Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 6 Nov 2018 09:05:26 +0100 Subject: [PATCH 2/4] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1e26185..79a9eef 100644 --- a/scripts/install +++ b/scripts/install @@ -106,6 +106,7 @@ ynh_install_nodejs 8 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list +ynh_package_update #============================================== # CREATE DB @@ -125,7 +126,6 @@ echo onlyoffice-documentserver onlyoffice/ds-port select 9980 | sudo debconf-set # INSTALL ONLYOFFICE #============================================== -ynh_package_update ynh_install_app_dependencies onlyoffice-documentserver #================================================= From 2f38d062ef90f87178cafdfc1ee7b98d2c6b5607 Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 6 Nov 2018 09:07:05 +0100 Subject: [PATCH 3/4] remove node part --- scripts/install | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/install b/scripts/install index 79a9eef..c8a9f4a 100644 --- a/scripts/install +++ b/scripts/install @@ -81,12 +81,6 @@ port=$(ynh_find_port 9980) yunohost firewall allow --no-upnp TCP $port 2>&1 ynh_app_setting_set $app port $port -#=============================================== -# ADD NODEJS REPOSITORY -#=============================================== - -curl -sL https://deb.nodesource.com/setup_8.x | sudo bash - - #============================================== # INSTALL POSTGRES #============================================== From 3ef803687bedf46ee9e6db2b518c8908b6963d6e Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 6 Nov 2018 09:09:49 +0100 Subject: [PATCH 4/4] no need to update --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index c8a9f4a..cfd685a 100644 --- a/scripts/install +++ b/scripts/install @@ -85,13 +85,12 @@ ynh_app_setting_set $app port $port # INSTALL POSTGRES #============================================== -ynh_package_update ynh_install_app_dependencies postgresql redis-server rabbitmq-server nginx-extras apt-transport-https #================================================= # INSTALL NODEJS #================================================= -# Use Helper instead of package from tthe repo +# Use Helper instead of package from the repo ynh_install_nodejs 8 #===============================================