Merge branch 'testing' into master

This commit is contained in:
anmol26s 2018-04-08 18:50:20 +05:30 committed by GitHub
commit ed5fc223b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions

View file

@ -70,6 +70,7 @@ ynh_app_setting_set "$app" is_public "$is_public"
# Find a free port # Find a free port
port=$(ynh_find_port 9000) port=$(ynh_find_port 9000)
# Open this port # Open this port
yunohost firewall allow Both "$port" 2>&1 yunohost firewall allow Both "$port" 2>&1
ynh_app_setting_set "$app" port "$port" ynh_app_setting_set "$app" port "$port"
@ -87,6 +88,9 @@ mkdir -p "$datadir"
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
#================================================= #=================================================
# install nodejs
ynh_install_nodejs 8
# install yarn # install yarn
wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
@ -99,9 +103,6 @@ ynh_package_update
# install postgresql, ffmpeg, redis # install postgresql, ffmpeg, redis
ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils
# install nodejs
ynh_install_nodejs 8
#================================================= #=================================================
# DATABASE SETUP # DATABASE SETUP
#================================================= #=================================================

View file

@ -91,6 +91,10 @@ chown -R "$app" "$datadir"
#================================================= #=================================================
# install yarn # install yarn
# install nodejs
ynh_install_nodejs 8
wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
dpkg -i yarn_1.5.1_all.deb dpkg -i yarn_1.5.1_all.deb
@ -102,9 +106,6 @@ ynh_package_update
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils
# install nodejs
ynh_install_nodejs 8
#================================================= #=================================================
# RESTORE THE PostgreSQL DATABASE # RESTORE THE PostgreSQL DATABASE
#================================================= #=================================================

View file

@ -79,6 +79,9 @@ ynh_system_user_create "$app"
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
#================================================= #=================================================
# install nodejs
ynh_install_nodejs 8
# install yarn # install yarn
wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
@ -91,9 +94,6 @@ ynh_package_update
# install postgresql, ffmpeg, redis # install postgresql, ffmpeg, redis
ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools mailutils
# install nodejs
ynh_install_nodejs 8
#================================================= #=================================================
# CHECK THE PATH # CHECK THE PATH
#================================================= #=================================================