diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..eadc11f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: python +install: "" +python: + - "3.5" +script: + - git clone https://github.com/YunoHost/package_linter + - python package_linter/package_linter.py . diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee8a21d --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2016 All contributors to The Lounge +Copyright (c) 2014 Mattias Erming and contributors, as part of Shout. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/check_process b/check_process index 10f4d4b..7cd79cc 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,7 @@ setup_public=1 upgrade=1 backup_restore=0 - multi_instance=1 + multi_instance=0 incorrect_path=1 port_already_use=1 change_url=0 @@ -27,8 +27,8 @@ Level 1=auto Level 2=auto Level 3=auto -# Level 4: - Level 4=1 # https://github.com/Rafi594/thelounge_ynh/blob/master/conf/config.js#L391-L452 +# Level 4: https://github.com/Rafi594/thelounge_ynh/blob/master/conf/config.js#L391-L452 + Level 4=1 # Level 5: Level 5=auto Level 6=auto diff --git a/manifest.json b/manifest.json index a350b32..295b586 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version": "2.7.1~ynh1", "url": "https://thelounge.chat/", - "license": "free", + "license": "MIT", "maintainer": { "name": "rafi59", "email": "rafi59_dev@srvmaison.fr.nf", diff --git a/scripts/upgrade b/scripts/upgrade index 6b6fa09..cf14a6f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -84,6 +84,13 @@ ynh_add_nginx_config # Create a system user ynh_system_user_create $app +#================================================= +# UPGRADE NODEJS +#================================================= + +systemctl stop thelounge +ynh_cron_upgrade_node + #================================================= # SETUP SYSTEMD #================================================= @@ -109,17 +116,15 @@ cp -a ../conf/config.js $config_path # UPGRADE THE LOUNGE #================================================= -# Upgrade Nodejs -ynh_install_nodejs ynh_setup_source $final_path cd $final_path npm install --unsafe-perm # Install webpack -npm install webpack -npm install webpack-cli -npm install copy-webpack-plugin +npm upgrade webpack +npm upgrade webpack-cli +npm upgrade copy-webpack-plugin # Build The Lounge NODE_ENV=production npm run build @@ -171,5 +176,6 @@ fi # RELOAD NGINX #================================================= -systemctl restart thelounge +systemctl start thelounge +sleep 30 systemctl reload nginx