mirror of
https://github.com/YunoHost-Apps/peertube_ynh.git
synced 2024-09-03 19:56:29 +02:00
Revert "Merge branch 'ovh_fix_testing' into testing"
This reverts commit565563c119
, reversing changes made to5a7754c82c
.
This commit is contained in:
parent
b1a59ec409
commit
6beca4fb0f
2 changed files with 15 additions and 16 deletions
|
@ -84,8 +84,7 @@ ynh_script_progression --message="Installing dependencies..."
|
|||
|
||||
ynh_install_apps --apps="$ynh_app_dependencies"
|
||||
ynh_install_app_dependencies $pkg_dependencies
|
||||
#ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
|
||||
ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
|
||||
|
||||
#=================================================
|
||||
|
@ -162,8 +161,8 @@ ynh_script_progression --message="Building Yarn dependencies..."
|
|||
|
||||
pushd "$final_path"
|
||||
ynh_use_nodejs
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -205,7 +204,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
|
|||
ynh_script_progression --message="Installing LDAP plugin..."
|
||||
|
||||
pushd "$final_path"
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-auth-ldap
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-auth-ldap
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -214,7 +213,7 @@ popd
|
|||
ynh_script_progression --message="Installing PeerTube livechat plugin..."
|
||||
|
||||
pushd "$final_path"
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-livechat
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-livechat
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -223,7 +222,7 @@ popd
|
|||
ynh_script_progression --message="Changing PeerTube admin password..."
|
||||
|
||||
pushd "$final_path"
|
||||
#echo $admin_pass | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run reset-password -- -u root
|
||||
echo $admin_pass | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run reset-password -- -u root
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -257,7 +256,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l
|
|||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
# Start a systemd service
|
||||
#ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost"
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost"
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
|
|
|
@ -190,7 +190,7 @@ then
|
|||
else
|
||||
cp ../conf/local-production.json "$final_path/config/local-production.json"
|
||||
fi
|
||||
|
||||
|
||||
# Remove the tmp directory securely
|
||||
ynh_secure_remove --file="$tmpdir"
|
||||
fi
|
||||
|
@ -206,7 +206,7 @@ ynh_script_progression --message="Upgrading dependencies..."
|
|||
|
||||
ynh_install_apps --apps="$ynh_app_dependencies"
|
||||
ynh_install_app_dependencies $pkg_dependencies
|
||||
#ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
|
||||
|
||||
#=================================================
|
||||
|
@ -249,9 +249,9 @@ chown $app:$app "$final_path/config/local-production.json"
|
|||
ynh_script_progression --message="Building Yarn dependencies..."
|
||||
|
||||
pushd "$final_path"
|
||||
#ynh_use_nodejs
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
|
||||
ynh_use_nodejs
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -276,7 +276,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
|
|||
ynh_script_progression --message="Installing LDAP plugin..."
|
||||
|
||||
pushd "$final_path"
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-auth-ldap
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-auth-ldap
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -285,7 +285,7 @@ popd
|
|||
ynh_script_progression --message="Installing PeerTube livechat plugin..."
|
||||
|
||||
pushd "$final_path"
|
||||
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-livechat
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-livechat
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
@ -336,7 +336,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l
|
|||
#=================================================
|
||||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
#ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost"
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost"
|
||||
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
|
|
Loading…
Reference in a new issue