From 7fda3a0a9ffb524fb891f4ec17442964c4ab60f3 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 8 Nov 2017 21:25:42 +0100 Subject: [PATCH 01/12] [fix] Bad ROOT_URL --- conf/systemd.service | 2 +- manifest.json | 2 +- scripts/install | 1 + scripts/upgrade | 10 ++++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index f7a2860..223cbc2 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,7 +11,7 @@ ExecStartPre=__NODEJS__ Environment="PATH=__ENV_PATH__" Environment=NODE_ENV=production Environment=MONGO_URL=mongodb://127.0.0.1:27017/__DB_NAME__ -Environment=ROOT_URL=http://127.0.0.1:__PORT____URI__ PORT=__PORT__ +Environment=ROOT_URL=https://__DOMAIN__:__PORT____URI__ PORT=__PORT__ WorkingDirectory=__FINALPATH__ ExecStart=/opt/node_n/bin/node __FINALPATH__/main.js Restart=on-failure diff --git a/manifest.json b/manifest.json index 022f9ae..fdae424 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Wekan", "id": "wekan", "packaging_format": 1, - "version": "0.45-1", + "version": "0.45-2", "description": { "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" diff --git a/scripts/install b/scripts/install index 8e35fc6..40370bf 100755 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,7 @@ ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service" ynh_replace_string "__DB_NAME__" "$app" "../conf/systemd.service" ynh_replace_string "__URI__" "$path_url" "../conf/systemd.service" ynh_replace_string "__PORT__" "$port" "../conf/systemd.service" +ynh_replace_string "__DOMAIN__" "$domain" "../conf/systemd.service" ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0777e92..9583409 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,7 @@ domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path_url) is_public=$(ynh_app_setting_get $app is_public) final_path=$(ynh_app_setting_get $app final_path) -port=$(ynh_app_setting_get $app final_path) +port=$(ynh_app_setting_get $app port) #================================================= # Check version @@ -40,9 +40,10 @@ ynh_abort_if_errors # Exit if an error occurs during the execution of the script # ENSURE DOWNWARD COMPATIBILITY #================================================= -#if [ "${version}" = "20160501-7" ]; then - -#fi +if [ "${version}" = "0.45-1" ]; then + ynh_replace_string "Environment=ROOT_URL=http://127.0.0.1:$port$path_url" "Environment=ROOT_URL=https://$domain$path_url/" "/etc/systemd/system/$app.service" + systemctl daemon-reload +fi #================================================= # STANDARD UPGRADE STEPS @@ -67,4 +68,5 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 #================================================= # RELOAD NGINX #================================================= +systemctl restart $app systemctl reload nginx From 45c6ec233a0b06d91fa1bd1ff9d64b951541d95e Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 8 Nov 2017 21:43:16 +0100 Subject: [PATCH 02/12] [enh] Add wekan services to ynh --- scripts/_future.sh | 2 ++ scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 5 ++++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/_future.sh b/scripts/_future.sh index abdb7ed..83a5313 100644 --- a/scripts/_future.sh +++ b/scripts/_future.sh @@ -209,3 +209,5 @@ EOF chmod +x "/etc/cron.daily/node_update" } + +ynh_version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } diff --git a/scripts/install b/scripts/install index 40370bf..a40e004 100755 --- a/scripts/install +++ b/scripts/install @@ -118,6 +118,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 # ADD SERVICE IN ADMIN PANEL #================================================= yunohost service add mongod --log "/var/log/mongodb.log" +yunohost service add wekan #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 998b396..e620557 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,6 +93,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 # ADD SERVICE IN ADMIN PANEL #================================================= yunohost service add mongod --log "/var/log/mongodb.log" +yunohost service add wekan #================================================= # SETUP SSOWAT diff --git a/scripts/upgrade b/scripts/upgrade index 9583409..2d4cc31 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,10 +40,13 @@ ynh_abort_if_errors # Exit if an error occurs during the execution of the script # ENSURE DOWNWARD COMPATIBILITY #================================================= -if [ "${version}" = "0.45-1" ]; then +if ynh_version_gt "0.45-2" "${version}" ; then ynh_replace_string "Environment=ROOT_URL=http://127.0.0.1:$port$path_url" "Environment=ROOT_URL=https://$domain$path_url/" "/etc/systemd/system/$app.service" systemctl daemon-reload fi +if ynh_version_gt "0.45-3" "${version}" ; then + yunohost service add wekan +fi #================================================= # STANDARD UPGRADE STEPS From 790578cedafd11e0fdee4b0c9de85453287ad591 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 9 Nov 2017 11:40:43 +0100 Subject: [PATCH 03/12] [fix] Mongodb fails starting on second install --- .gitignore | 3 +++ conf/app.src | 6 +++--- manifest.json | 2 +- scripts/install | 10 +++++----- scripts/restore | 2 +- scripts/upgrade | 4 ++++ 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e961147 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.swp +*.swo + diff --git a/conf/app.src b/conf/app.src index 2d09448..f23f5b7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.45/wekan-0.45.tar.gz -SOURCE_SUM=4245f6674e407ad40bc899788058887213d5daf8d7620e0ae0c07af22b7c82aa +SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.54/wekan-0.54.tar.gz +SOURCE_SUM=fc3be49f1f317182a838f4b0deb058c35226e9d4609af9ea2050b4b866b2d4b1 SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-0.45.tar.gz +SOURCE_FILENAME=wekan-0.54.tar.gz diff --git a/manifest.json b/manifest.json index fdae424..3fad3fa 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Wekan", "id": "wekan", "packaging_format": 1, - "version": "0.45-2", + "version": "0.54-2", "description": { "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" diff --git a/scripts/install b/scripts/install index a40e004..35e6d8b 100755 --- a/scripts/install +++ b/scripts/install @@ -51,8 +51,8 @@ ynh_app_setting_set $app port $port ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 -echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.2.list +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 +echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/testing main" > /etc/apt/sources.list.d/mongodb-org.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" @@ -89,8 +89,8 @@ npm install popd # Start mogodb -systemctl start mongod systemctl enable mongod +systemctl restart mongod #================================================= # SETUP SYSTEMD @@ -99,7 +99,7 @@ systemctl enable mongod ynh_replace_string "__NODEJS__" "$nodejs_use_version" "../conf/systemd.service" ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service" ynh_replace_string "__DB_NAME__" "$app" "../conf/systemd.service" -ynh_replace_string "__URI__" "$path_url" "../conf/systemd.service" +ynh_replace_string "__URI__" "$path_url/" "../conf/systemd.service" ynh_replace_string "__PORT__" "$port" "../conf/systemd.service" ynh_replace_string "__DOMAIN__" "$domain" "../conf/systemd.service" ynh_add_systemd_config @@ -135,4 +135,4 @@ fi # RELOAD NGINX #================================================= systemctl reload nginx -systemctl start $app +systemctl restart $app diff --git a/scripts/restore b/scripts/restore index e620557..301b453 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,8 +64,8 @@ ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell m # RESTORE DB #================================================= # Start mogodb -systemctl start mongod systemctl enable mongod +systemctl start mongod mongorestore --db $app ./dump #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2d4cc31..949a37b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,6 +47,10 @@ fi if ynh_version_gt "0.45-3" "${version}" ; then yunohost service add wekan fi +if ynh_version_gt "0.54-2" "${version}" ; then + systemctl enable mongod + systemctl restart mongod +fi #================================================= # STANDARD UPGRADE STEPS From 79c03c6fd863fb7a2b1d6b46f44c445cfff9811d Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 9 Nov 2017 11:47:01 +0100 Subject: [PATCH 04/12] [fix] 502 error at the end of each script --- scripts/install | 2 +- scripts/restore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 35e6d8b..35e1849 100755 --- a/scripts/install +++ b/scripts/install @@ -134,5 +134,5 @@ fi #================================================= # RELOAD NGINX #================================================= -systemctl reload nginx systemctl restart $app +systemctl reload nginx diff --git a/scripts/restore b/scripts/restore index 301b453..b363d0d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,4 +109,5 @@ fi #================================================= # RELOAD NGINX #================================================= +systemctl restart $app systemctl reload nginx From 28afa51fd8d507f7aa308ac0f5e2dd25d8452210 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 9 Nov 2017 12:07:40 +0100 Subject: [PATCH 05/12] [fix] Bad url in registration link --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 223cbc2..70c3e2f 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,7 +11,7 @@ ExecStartPre=__NODEJS__ Environment="PATH=__ENV_PATH__" Environment=NODE_ENV=production Environment=MONGO_URL=mongodb://127.0.0.1:27017/__DB_NAME__ -Environment=ROOT_URL=https://__DOMAIN__:__PORT____URI__ PORT=__PORT__ +Environment=ROOT_URL=https://__DOMAIN____URI__ PORT=__PORT__ WorkingDirectory=__FINALPATH__ ExecStart=/opt/node_n/bin/node __FINALPATH__/main.js Restart=on-failure From 9cd0b82650e3bc2d093611aa672707e348825ec5 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 9 Nov 2017 12:13:38 +0100 Subject: [PATCH 06/12] [fix] Bad service name giving to ynh --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 35e1849..b59350c 100755 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 # ADD SERVICE IN ADMIN PANEL #================================================= yunohost service add mongod --log "/var/log/mongodb.log" -yunohost service add wekan +yunohost service add $app #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index b363d0d..456bc1d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,7 +93,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 # ADD SERVICE IN ADMIN PANEL #================================================= yunohost service add mongod --log "/var/log/mongodb.log" -yunohost service add wekan +yunohost service add $app #================================================= # SETUP SSOWAT diff --git a/scripts/upgrade b/scripts/upgrade index 949a37b..0034a5d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,7 +45,7 @@ if ynh_version_gt "0.45-2" "${version}" ; then systemctl daemon-reload fi if ynh_version_gt "0.45-3" "${version}" ; then - yunohost service add wekan + yunohost service add $app fi if ynh_version_gt "0.54-2" "${version}" ; then systemctl enable mongod From e15764217192ee7c95f918ee6b54febae1ae979c Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 9 Nov 2017 22:33:21 +0100 Subject: [PATCH 07/12] [fix] Use mongodb 3.2 --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b59350c..af737ab 100755 --- a/scripts/install +++ b/scripts/install @@ -51,8 +51,8 @@ ynh_app_setting_set $app port $port ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 -echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/testing main" > /etc/apt/sources.list.d/mongodb-org.list +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 +echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.2 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" From bb99cca1cce0c8d52c8ddd55566998d22f91a497 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 14 Dec 2017 21:55:35 +0100 Subject: [PATCH 08/12] [fix] Mongodb key change --- manifest.json | 2 +- scripts/install | 2 +- scripts/remove | 3 ++- scripts/restore | 2 +- scripts/upgrade | 4 ++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 3fad3fa..d409fce 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Wekan", "id": "wekan", "packaging_format": 1, - "version": "0.54-2", + "version": "0.54-3", "description": { "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" diff --git a/scripts/install b/scripts/install index af737ab..01db154 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_app_setting_set $app port $port ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.2 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/remove b/scripts/remove index c0a17f5..f032562 100755 --- a/scripts/remove +++ b/scripts/remove @@ -54,7 +54,8 @@ ynh_remove_nodejs # REMOVE MONGODB #================================================= # TODO / FIXME : remove the keys added ? -#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 +#apt-key del EA312927 +#apt-key del 0C49F3730359A14518585931BC711F9BA15703C6 #rm -f /etc/apt/sources.list.d/mongodb-org-3.2.list diff --git a/scripts/restore b/scripts/restore index 456bc1d..3ce5f5b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_system_user_create $app "$final_path" ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/upgrade b/scripts/upgrade index 0034a5d..1a3eb3e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,6 +51,10 @@ if ynh_version_gt "0.54-2" "${version}" ; then systemctl enable mongod systemctl restart mongod fi +if ynh_version_gt "0.54-3" "${version}" ; then + apt-key del EA312927 + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 +fi #================================================= # STANDARD UPGRADE STEPS From 31782cc3de622a66e5c6d361ee2ff437d5b5594d Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 14 Dec 2017 22:07:59 +0100 Subject: [PATCH 09/12] [enh] Update upstream version --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index f23f5b7..1d83fba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.54/wekan-0.54.tar.gz -SOURCE_SUM=fc3be49f1f317182a838f4b0deb058c35226e9d4609af9ea2050b4b866b2d4b1 +SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.62/wekan-0.62.tar.gz +SOURCE_SUM=b5da8106cc49e6615f665e9bd941b44fb5ee326414f68d44bf4756b139cfdfc6 SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-0.54.tar.gz +SOURCE_FILENAME=wekan-0.62.tar.gz diff --git a/manifest.json b/manifest.json index d409fce..9031f48 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Wekan", "id": "wekan", "packaging_format": 1, - "version": "0.54-3", + "version": "0.62-1", "description": { "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" From 9c22e79dec476b2c1524e252e119077af9265343 Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 23 Dec 2017 00:05:14 +0100 Subject: [PATCH 10/12] [fix] Bad signature --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 01db154..8455cd4 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_app_setting_set $app port $port ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 +apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.2 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/restore b/scripts/restore index 3ce5f5b..3198973 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_system_user_create $app "$final_path" ynh_install_nodejs 4.8.4 # Install mongodb -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 +apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/upgrade b/scripts/upgrade index 1a3eb3e..7059792 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,7 +53,7 @@ if ynh_version_gt "0.54-2" "${version}" ; then fi if ynh_version_gt "0.54-3" "${version}" ; then apt-key del EA312927 - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 + apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc fi #================================================= From 6ee4f1e99541ac73c19f8c6fbd5dae928feadf0d Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 23 Dec 2017 00:13:19 +0100 Subject: [PATCH 11/12] [enh] Update upstream version to 0.63 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 1d83fba..e5619b3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.62/wekan-0.62.tar.gz -SOURCE_SUM=b5da8106cc49e6615f665e9bd941b44fb5ee326414f68d44bf4756b139cfdfc6 +SOURCE_URL=https://github.com/wekan/wekan/releases/download/v0.63/wekan-0.63.tar.gz +SOURCE_SUM=5a582446859d2563bf7a5f6e7d7bc1e6d8c63a6021f0f2e024cab0ffea78c5aa SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9031f48..13fde08 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Wekan", "id": "wekan", "packaging_format": 1, - "version": "0.62-1", + "version": "0.63-1", "description": { "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" diff --git a/scripts/install b/scripts/install index 8455cd4..7fbb72c 100755 --- a/scripts/install +++ b/scripts/install @@ -48,7 +48,7 @@ ynh_app_setting_set $app port $port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_install_nodejs 4.8.4 +ynh_install_nodejs 4.8.7 # Install mongodb apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc diff --git a/scripts/restore b/scripts/restore index 3198973..45c74c8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,7 +52,7 @@ ynh_system_user_create $app "$final_path" #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_install_nodejs 4.8.4 +ynh_install_nodejs 4.8.7 # Install mongodb apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc diff --git a/scripts/upgrade b/scripts/upgrade index 7059792..116e7bb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,6 +55,9 @@ if ynh_version_gt "0.54-3" "${version}" ; then apt-key del EA312927 apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc fi +if ynh_version_gt "0.63-1" "${version}" ; then + ynh_install_nodejs 4.8.7 +fi #================================================= # STANDARD UPGRADE STEPS From 7001225f8423dcb388564fd8beb234c9f13b7d8e Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 23 Dec 2017 00:20:39 +0100 Subject: [PATCH 12/12] [fix] Can't download signature --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 7fbb72c..9757760 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_app_setting_set $app port $port ynh_install_nodejs 4.8.7 # Install mongodb -apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc +wget https://www.mongodb.org/static/pgp/server-3.2.asc -o - | apt-key add - echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.2 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/restore b/scripts/restore index 45c74c8..3ece36b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_system_user_create $app "$final_path" ynh_install_nodejs 4.8.7 # Install mongodb -apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc +wget https://www.mongodb.org/static/pgp/server-3.2.asc -o - | apt-key add - echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_install_app_dependencies "mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools" diff --git a/scripts/upgrade b/scripts/upgrade index 116e7bb..9427a4a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,7 +53,7 @@ if ynh_version_gt "0.54-2" "${version}" ; then fi if ynh_version_gt "0.54-3" "${version}" ; then apt-key del EA312927 - apt-key adv --fetch-keys https://www.mongodb.org/static/pgp/server-3.2.asc + wget https://www.mongodb.org/static/pgp/server-3.2.asc -o - | apt-key add - fi if ynh_version_gt "0.63-1" "${version}" ; then ynh_install_nodejs 4.8.7