From b0f497f83b890ad4cc3e98faa41d6017ada1f75f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 15 Feb 2020 20:13:42 +0100 Subject: [PATCH 01/13] Upgrade to 3.79 --- README.md | 2 +- conf/.env | 165 ++++++++++++------------------------------------ conf/arm64.src | 10 +-- conf/x86-64.src | 10 +-- manifest.json | 2 +- 5 files changed, 51 insertions(+), 138 deletions(-) diff --git a/README.md b/README.md index c82db23..56da4f4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Wekan is an open-source kanban board (task manager and organizer) -**Shipped version:** 3.55 +**Shipped version:** 3.79 ## Screenshots diff --git a/conf/.env b/conf/.env index 7402d80..93772ad 100644 --- a/conf/.env +++ b/conf/.env @@ -1,38 +1,38 @@ +# Based on start-wekan.sh +#--------------------------------------------- # The Node Environnement NODE_ENV=production # The path to NODEJS PATH=__NODEJS_PATH__ -#--------------------------------------------------------------- +#--------------------------------------------- # Debug OIDC OAuth2 etc. #DEBUG=true - -#--------------------------------------------------------------- +#--------------------------------------------- # URL of the mongodb MONGO_URL=mongodb://127.0.0.1:27017/__DB_NAME__ - +#--------------------------------------------- # ROOT_URL EXAMPLES FOR WEBSERVERS: https://github.com/wekan/wekan/wiki/Settings # Production: https://example.com/wekan -# Local: http://localhost:3000 +# Local: http://localhost:2000 # ipaddress=$(ifdata -pa eth0) ROOT_URL=https://__DOMAIN_URI__ - -#--------------------------------------------------------------- +#--------------------------------------------- # Working email IS NOT REQUIRED to use Wekan. # https://github.com/wekan/wekan/wiki/Adding-users # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml -MAIL_URL='smtp://localhost:25' +MAIL_URL='smtp://localhost:25/' MAIL_FROM='Wekan Support ' - -# This is local port where Wekan Node.js runs +#--------------------------------------------- +#KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011 +#--------------------------------------------- +# This is local port where Wekan Node.js runs, same as below on Caddyfile settings. PORT=__PORT__ - -#--------------------------------------------------------------- -# Wekan Export Board works when WITH_API='true'. -# If you disable Wekan API, Export Board does not work. +#--------------------------------------------- +# Wekan Board works when WITH_API=true. +# If you disable Wekan API with false, Board does not work. WITH_API='true' - #--------------------------------------------------------------- # ==== PASSWORD BRUTE FORCE PROTECTION ==== # https://atmospherejs.com/lucasantoniassi/accounts-lockout @@ -43,22 +43,18 @@ WITH_API='true' #ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 #ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 #ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 - #--------------------------------------------------------------- # ==== RICH TEXT EDITOR IN CARD COMMENTS ==== # https://github.com/wekan/wekan/pull/2560 RICHER_CARD_COMMENT_EDITOR=true - #--------------------------------------------------------------- # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== CARD_OPENED_WEBHOOK_ENABLED=false - #--------------------------------------------------------------- # ==== Allow to shrink attached/pasted image ==== # https://github.com/wekan/wekan/pull/2544 #MAX_IMAGE_PIXEL=1024 #IMAGE_COMPRESS_RATIO=80 - #--------------------------------------------------------------- # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== # https://github.com/wekan/wekan/pull/2541 @@ -75,7 +71,6 @@ CARD_OPENED_WEBHOOK_ENABLED=false #BIGEVENTS_PATTERN=received|start|due|end # c) Disabled BIGEVENTS_PATTERN=NONE - #--------------------------------------------------------------- # ==== EMAIL DUE DATE NOTIFICATION ===== # https://github.com/wekan/wekan/pull/2536 @@ -90,55 +85,43 @@ BIGEVENTS_PATTERN=NONE # Notify due at hour of day. Default every morning at 8am. Can be 0-23. # If env variable has parsing error, use default. Notification sent to watchers. # NOTIFY_DUE_AT_HOUR_OF_DAY=8 - -#--------------------------------------------------------------- +#----------------------------------------------------------------- # ==== EMAIL NOTIFICATION TIMEOUT, ms ===== # Defaut: 30000 ms = 30s #EMAIL_NOTIFICATION_TIMEOUT=30000 - -#--------------------------------------------------------------- +#----------------------------------------------------------------- # CORS: Set Access-Control-Allow-Origin header. Example: * #CORS=* - # To enable the Set Access-Control-Allow-Headers header. "Authorization,Content-Type" is required for cross-origin use of the API. #CORS_ALLOW_HEADERS=Authorization,Content-Type - # To enable the Set Access-Control-Expose-Headers header. This is not needed for typical CORS situations. Example: * #CORS_EXPOSE_HEADERS=* - -#--------------------------------------------------------------- +#--------------------------------------------- # Optional: Integration with Matomo https://matomo.org that is installed to your server # The address of the server where Matomo is hosted: # MATOMO_ADDRESS=https://example.com/matomo #MATOMO_ADDRESS= - # The value of the site ID given in Matomo server for Wekan # Example: MATOMO_SITE_ID=123456789 #MATOMO_SITE_ID='' - # The option do not track which enables users to not be tracked by matomo" # Example: MATOMO_DO_NOT_TRACK=false #MATOMO_DO_NOT_TRACK=true - # The option that allows matomo to retrieve the username: # Example: MATOMO_WITH_USERNAME=true #MATOMO_WITH_USERNAME='false' - # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside. # Setting this to false is not recommended, it also disables all other browser policy protections # and allows all iframing etc. See wekan/server/policy.js # Default value: true BROWSER_POLICY_ENABLED=true - # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside. # Example: TRUSTED_URL=http://example.com TRUSTED_URL='' - # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId . # Example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId WEBHOOKS_ATTRIBUTES='' - -#--------------------------------------------------------------- +#--------------------------------------------- # ==== OAUTH2 AZURE ==== # https://github.com/wekan/wekan/wiki/Azure # 1) Register the application with Azure. Make sure you capture @@ -146,43 +129,29 @@ WEBHOOKS_ATTRIBUTES='' # 2) Configure the environment variables. This differs slightly # by installation type, but make sure you have the following: #OAUTH2_ENABLED=true - +# OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2 # OAuth2 login style: popup or redirect. #OAUTH2_LOGIN_STYLE=redirect - # Application GUID captured during app registration: #OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx - # Secret key generated during app registration: #OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx #OAUTH2_SERVER_URL=https://login.microsoftonline.com/ #OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize #OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo #OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token - -# OAUTH2 ID Token Whitelist Fields. -#OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] - -# OAUTH2 Request Permissions. -#OAUTH2_REQUEST_PERMISSIONS='openid profile email' - # The claim name you want to map to the unique ID field: #OAUTH2_ID_MAP=email - # The claim name you want to map to the username field: #OAUTH2_USERNAME_MAP=email - # The claim name you want to map to the full name field: #OAUTH2_FULLNAME_MAP=name - -# Tthe claim name you want to map to the email field: +# The claim name you want to map to the email field: #OAUTH2_EMAIL_MAP=email - -#--------------------------------------------------------------- +#----------------------------------------------------------------- # ==== OAUTH2 KEYCLOAK ==== # https://github.com/wekan/wekan/wiki/Keycloak <== MAPPING INFO, REQUIRED #OAUTH2_ENABLED=true - # OAuth2 login style: popup or redirect. #OAUTH2_LOGIN_STYLE=redirect #OAUTH2_CLIENT_ID= @@ -191,297 +160,241 @@ WEBHOOKS_ATTRIBUTES='' #OAUTH2_USERINFO_ENDPOINT=/realms//protocol/openid-connect/userinfo #OAUTH2_TOKEN_ENDPOINT=/realms//protocol/openid-connect/token #OAUTH2_SECRET= - -#--------------------------------------------------------------- +#----------------------------------------------------------------- # ==== OAUTH2 DOORKEEPER ==== # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2 # https://github.com/wekan/wekan/issues/1874 # https://github.com/wekan/wekan/wiki/OAuth2 # Enable the OAuth2 connection #OAUTH2_ENABLED=true - # OAuth2 login style: popup or redirect. #OAUTH2_LOGIN_STYLE=redirect - # OAuth2 Client ID. #OAUTH2_CLIENT_ID=abcde12345 - # OAuth2 Secret. #OAUTH2_SECRET=54321abcde - # OAuth2 Server URL. #OAUTH2_SERVER_URL=https://chat.example.com - # OAuth2 Authorization Endpoint. #OAUTH2_AUTH_ENDPOINT=/oauth/authorize - # OAuth2 Userinfo Endpoint. #OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo - # OAuth2 Token Endpoint. #OAUTH2_TOKEN_ENDPOINT=/oauth/token - +# OAUTH2 ID Token Whitelist Fields. +#OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] +# OAUTH2 Request Permissions. +#OAUTH2_REQUEST_PERMISSIONS='openid profile email' # OAuth2 ID Mapping #OAUTH2_ID_MAP= - # OAuth2 Username Mapping #OAUTH2_USERNAME_MAP= - # OAuth2 Fullname Mapping #OAUTH2_FULLNAME_MAP= - # OAuth2 Email Mapping #OAUTH2_EMAIL_MAP= - -#--------------------------------------------------------------- +#--------------------------------------------- # LDAP_ENABLE : Enable or not the connection by the LDAP # example : LDAP_ENABLE=true #LDAP_ENABLE=false LDAP_ENABLE=true - # LDAP_PORT : The port of the LDAP server # example : LDAP_PORT=389 #LDAP_PORT=389 LDAP_PORT=389 - # LDAP_HOST : The host server for the LDAP server # example : LDAP_HOST=localhost #LDAP_HOST= LDAP_HOST=localhost - # LDAP_BASEDN : The base DN for the LDAP Tree # example : LDAP_BASEDN=ou=user,dc=example,dc=org #LDAP_BASEDN= LDAP_BASEDN=dc=yunohost,dc=org - # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method # example : LDAP_LOGIN_FALLBACK=true #LDAP_LOGIN_FALLBACK=false LDAP_LOGIN_FALLBACK=true - # LDAP_RECONNECT : Reconnect to the server if the connection is lost # example : LDAP_RECONNECT=false #LDAP_RECONNECT=true LDAP_RECONNECT=true - # LDAP_TIMEOUT : Overall timeout, in milliseconds # example : LDAP_TIMEOUT=12345 #LDAP_TIMEOUT=10000 LDAP_TIMEOUT=10000 - # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds # example : LDAP_IDLE_TIMEOUT=12345 #LDAP_IDLE_TIMEOUT=10000 LDAP_IDLE_TIMEOUT=10000 - # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds # example : LDAP_CONNECT_TIMEOUT=12345 #LDAP_CONNECT_TIMEOUT=10000 LDAP_CONNECT_TIMEOUT=10000 - # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search # example : LDAP_AUTHENTIFICATION=true #LDAP_AUTHENTIFICATION=false LDAP_AUTHENTIFICATION=false - # LDAP_AUTHENTIFICATION_USERDN : The search user DN # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org -#LDAP_AUTHENTIFICATION_USERDN= - +#---------------------------------------------------------------------------- +# The search user DN - You need quotes when you have spaces in parameters +# 2 examples: +#LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan" +#LDAP_AUTHENTIFICATION_USERDN="CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com" +#--------------------------------------------------------------------------- # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user # example : AUTHENTIFICATION_PASSWORD=admin #LDAP_AUTHENTIFICATION_PASSWORD= - # LDAP_LOG_ENABLED : Enable logs for the module # example : LDAP_LOG_ENABLED=true #LDAP_LOG_ENABLED=false LDAP_LOG_ENABLED=true - # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background # example : LDAP_BACKGROUND_SYNC=true #LDAP_BACKGROUND_SYNC=false LDAP_BACKGROUND_SYNC=true - # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds # At which interval does the background task sync in milliseconds. # Leave this unset, so it uses default, and does not crash. # https://github.com/wekan/wekan/issues/2354#issuecomment-515305722 -#LDAP_BACKGROUND_SYNC_INTERVAL=100 -LDAP_BACKGROUND_SYNC_INTERVAL=100 - +LDAP_BACKGROUND_SYNC_INTERVAL='' # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED : # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true #LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true - # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS : # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true #LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true - # LDAP_ENCRYPTION : If using LDAPS # example : LDAP_ENCRYPTION=ssl #LDAP_ENCRYPTION=false - # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file. # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE----- #LDAP_CA_CERT= - # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate # example : LDAP_REJECT_UNAUTHORIZED=true #LDAP_REJECT_UNAUTHORIZED=false - # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key). #LDAP_USER_AUTHENTICATION=true - # Which field is used to find the user for the user authentication. Default: uid. #LDAP_USER_AUTHENTICATION_FIELD=uid - # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed # example : LDAP_USER_SEARCH_FILTER= #LDAP_USER_SEARCH_FILTER= LDAP_USER_SEARCH_FILTER="(objectclass=posixAccount)" - # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree) # example : LDAP_USER_SEARCH_SCOPE=one #LDAP_USER_SEARCH_SCOPE= LDAP_USER_SEARCH_SCOPE=sub - # LDAP_USER_SEARCH_FIELD : Which field is used to find the user # example : LDAP_USER_SEARCH_FIELD=uid #LDAP_USER_SEARCH_FIELD= LDAP_USER_SEARCH_FIELD=uid - # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited) # example : LDAP_SEARCH_PAGE_SIZE=12345 #LDAP_SEARCH_PAGE_SIZE=0 LDAP_SEARCH_PAGE_SIZE=0 - # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited) # example : LDAP_SEARCH_SIZE_LIMIT=12345 #LDAP_SEARCH_SIZE_LIMIT=0 LDAP_SEARCH_SIZE_LIMIT=0 - # LDAP_GROUP_FILTER_ENABLE : Enable group filtering # example : LDAP_GROUP_FILTER_ENABLE=true #LDAP_GROUP_FILTER_ENABLE=false LDAP_GROUP_FILTER_ENABLE=true - # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering # example : LDAP_GROUP_FILTER_OBJECTCLASS=group #LDAP_GROUP_FILTER_OBJECTCLASS= LDAP_GROUP_FILTER_OBJECTCLASS=posixGroup - # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE : # example : #LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE= LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=cn - # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE : # example : #LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE= LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=memberUid - # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT : # example : #LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT= LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=uid - # LDAP_GROUP_FILTER_GROUP_NAME : # example : LDAP_GROUP_FILTER_GROUP_NAME=wekan_user #LDAP_GROUP_FILTER_GROUP_NAME= LDAP_GROUP_FILTER_GROUP_NAME=sftpusers - # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier) # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid #LDAP_UNIQUE_IDENTIFIER_FIELD= LDAP_UNIQUE_IDENTIFIER_FIELD=entryUUID - # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8 # example : LDAP_UTF8_NAMES_SLUGIFY=false #LDAP_UTF8_NAMES_SLUGIFY=true LDAP_UTF8_NAMES_SLUGIFY=true - # LDAP_USERNAME_FIELD : Which field contains the ldap username # example : LDAP_USERNAME_FIELD=username #LDAP_USERNAME_FIELD= LDAP_USERNAME_FIELD=uid - # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname # example : LDAP_FULLNAME_FIELD=fullname #LDAP_FULLNAME_FIELD= LDAP_FULLNAME_FIELD=cn - # LDAP_MERGE_EXISTING_USERS : # example : LDAP_MERGE_EXISTING_USERS=true #LDAP_MERGE_EXISTING_USERS=false LDAP_MERGE_EXISTING_USERS=true - # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match # example: LDAP_EMAIL_MATCH_ENABLE=true #LDAP_EMAIL_MATCH_ENABLE=false LDAP_EMAIL_MATCH_ENABLE=true - # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match # example: LDAP_EMAIL_MATCH_REQUIRE=true #LDAP_EMAIL_MATCH_REQUIRE=false LDAP_EMAIL_MATCH_REQUIRE=false - # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching # example: LDAP_EMAIL_MATCH_VERIFIED=true #LDAP_EMAIL_MATCH_VERIFIED=false LDAP_EMAIL_MATCH_VERIFIED=false - # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address # example: LDAP_EMAIL_FIELD=mail #LDAP_EMAIL_FIELD= LDAP_EMAIL_FIELD=mail - # LDAP_SYNC_USER_DATA : # example : LDAP_SYNC_USER_DATA=true #LDAP_SYNC_USER_DATA=false LDAP_SYNC_USER_DATA=true - # LDAP_SYNC_USER_DATA_FIELDMAP : # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"} #LDAP_SYNC_USER_DATA_FIELDMAP= LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name"} - # LDAP_SYNC_GROUP_ROLES : # example : #LDAP_SYNC_GROUP_ROLES= LDAP_SYNC_GROUP_ROLES=admins - # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP # example : #LDAP_DEFAULT_DOMAIN= - # Enable/Disable syncing of admin status based on ldap groups: #LDAP_SYNC_ADMIN_STATUS=true LDAP_SYNC_ADMIN_STATUS=true - -# Comma separated list of admin group names. +# Comma separated list of admin group names to sync. #LDAP_SYNC_ADMIN_GROUPS=group1,group2 LDAP_SYNC_ADMIN_GROUPS=admins - -#--------------------------------------------------------------- +#--------------------------------------------------------------------- # Login to LDAP automatically with HTTP header. # In below example for siteminder, at right side of = is header name. #HEADER_LOGIN_ID=HEADERUID #HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME #HEADER_LOGIN_LASTNAME=HEADERLASTNAME #HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS - -#--------------------------------------------------------------- +#--------------------------------------------------------------------- # LOGOUT_WITH_TIMER : Enables or not the option logout with timer # example : LOGOUT_WITH_TIMER=true #LOGOUT_WITH_TIMER= - # LOGOUT_IN : The number of days # example : LOGOUT_IN=1 #LOGOUT_IN= #LOGOUT_ON_HOURS= - # LOGOUT_ON_MINUTES : The number of minutes # example : LOGOUT_ON_MINUTES=55 -#LOGOUT_ON_MINUTES= \ No newline at end of file +#LOGOUT_ON_MINUTES= diff --git a/conf/arm64.src b/conf/arm64.src index c430bb0..87b9cf3 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,9 +1,9 @@ # This is on YunoHost server just to avoid the file from disappearing -# Original source is https://releases.wekan.team/raspi3/wekan-3.55-arm64.zip -# YunoHost source is https://build.yunohost.org/apps/wekan-3.55-arm64.zip -SOURCE_URL=https://build.yunohost.org/apps/wekan-3.55-arm64.zip -SOURCE_SUM=1d5aa2f1366bc817e94488862a8938be142f3dc0630b5e8bd00531dc1b249be1 +# Original source is https://releases.wekan.team/raspi3/wekan-3.79-arm64.zip +# YunoHost source is https://build.yunohost.org/apps/wekan-3.79-arm64.zip +SOURCE_URL=https://build.yunohost.org/apps/wekan-3.79-arm64.zip +SOURCE_SUM=1c389d9f0963f19614be90722e2dc05dc0bac2c0c75de4a3063100dbe87129ea SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-3.55-arm64.zip +SOURCE_FILENAME=wekan-3.79-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 950881d..b8ae685 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,9 +1,9 @@ # This is on YunoHost server just to avoid the file from disappearing -# Original source is https://releases.wekan.team/wekan-3.55.zip -# YunoHost source is https://build.yunohost.org/apps/wekan-3.55.zip -SOURCE_URL=https://build.yunohost.org/apps/wekan-3.55.zip -SOURCE_SUM=9b5c9d7d3a72d3864ee68cc537f924738430dde208aac0e3139b8faccd3a8197 +# Original source is https://releases.wekan.team/wekan-3.79.zip +# YunoHost source is https://build.yunohost.org/apps/wekan-3.79.zip +SOURCE_URL=https://build.yunohost.org/apps/wekan-3.79.zip +SOURCE_SUM=b5bf48e4f709bb3b1a86d8db8d50c9aa8468c640fff1806135881da0de976f01 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-3.55.zip +SOURCE_FILENAME=wekan-3.79.zip diff --git a/manifest.json b/manifest.json index 27a4ed2..531800e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" }, - "version": "3.55~ynh1", + "version": "3.79~ynh1", "url": "https://wekan.io", "license": "MIT", "maintainer": [ From 01ff435ee8c25558ea88361db180b2a6f918a093 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Feb 2020 11:51:50 +0100 Subject: [PATCH 02/13] Upgrade nodejs version --- scripts/_common.sh | 1 + scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 11 +++++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6d58a5a..c1ffb11 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,6 +6,7 @@ # dependencies used by the app pkg_dependencies="mongodb mongodb-server mongo-tools" +nodejs_version=12.15.0 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 4c7e1e3..53e71d6 100755 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_print_info --message="Installing dependencies..." -ynh_install_nodejs --nodejs_version="8.16.2" +ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/restore b/scripts/restore index 0eb0e07..c2943ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 ynh_print_info --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_nodejs --nodejs_version="8.16.2" +ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/upgrade b/scripts/upgrade index 4880de0..3235033 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,7 +138,7 @@ fi if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then # Install dependencies ynh_remove_nodejs - ynh_install_nodejs --nodejs_version="8.16.2" + ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs # Create a dedicated systemd config @@ -157,6 +157,13 @@ if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then ynh_store_file_checksum "$config_file" fi +if ynh_version_gt "3.79~ynh1" "${previous_version}" ; then + # Install dependencies + ynh_remove_nodejs + ynh_install_nodejs --nodejs_version=$nodejs_version + ynh_use_nodejs +fi + #================================================= # CHECK THE PATH #================================================= @@ -214,7 +221,7 @@ ynh_add_nginx_config #================================================= ynh_print_info --message="Upgrading dependencies..." -ynh_install_nodejs --nodejs_version="8.16.0" +ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies From 7d6646a343b77e06d142eb2d543b3feac9ebf12f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Feb 2020 14:03:50 +0100 Subject: [PATCH 03/13] fix upgrade --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3235033..a7c1f55 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -157,13 +157,6 @@ if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then ynh_store_file_checksum "$config_file" fi -if ynh_version_gt "3.79~ynh1" "${previous_version}" ; then - # Install dependencies - ynh_remove_nodejs - ynh_install_nodejs --nodejs_version=$nodejs_version - ynh_use_nodejs -fi - #================================================= # CHECK THE PATH #================================================= From f631bf45a977bb17d49fa8dbd09736220deccf00 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 Feb 2020 23:06:11 +0100 Subject: [PATCH 04/13] Fix upgrade --- check_process | 3 +++ scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 18 ++++++++++++++++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 25fbfda..54f979c 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,10 @@ setup_private=1 setup_public=1 upgrade=1 + # 2.98 upgrade=1 from_commit=dab614bd7679f2f7978d1df2e360fba7ae0edfa4 + # 3.45 + upgrade=1 from_commit=ca58231e8488e09a2cb298f9c85e2f0387f238e6 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. diff --git a/scripts/_common.sh b/scripts/_common.sh index c1ffb11..681c2d6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app pkg_dependencies="mongodb mongodb-server mongo-tools" -nodejs_version=12.15.0 +nodejsversion=12.15.0 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 53e71d6..cf27827 100755 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_print_info --message="Installing dependencies..." -ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/restore b/scripts/restore index c2943ad..cbf1c11 100644 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 ynh_print_info --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/upgrade b/scripts/upgrade index a7c1f55..81c0f89 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,15 +73,18 @@ ynh_abort_if_errors ynh_print_info --message="Managing upgrade from previous version..." if ynh_version_gt "0.45-2" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 0.45-2..." ynh_replace_string --match_string="Environment=ROOT_URL=http://127.0.0.1:$port$path_url" --replace_string="Environment=ROOT_URL=https://$domain$path_url/" --target_file="/etc/systemd/system/$app.service" systemctl daemon-reload fi if ynh_version_gt "0.45-3" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 0.45-3..." yunohost service add $app fi if ynh_version_gt "0.77-2" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 0.77-2..." ynh_install_nodejs --nodejs_version="8.9.3" ynh_use_nodejs @@ -96,6 +99,7 @@ if ynh_version_gt "0.77-2" "${previous_version}" ; then fi if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 1.07~ynh2..." # Replace mongodb packages # Assume no other app needs it >.> @@ -115,6 +119,7 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then fi if ynh_version_gt "2.48~ynh1" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 2.48~ynh1..." # Install dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version="8.16.0" @@ -136,9 +141,10 @@ if ynh_version_gt "2.48~ynh1" "${previous_version}" ; then fi if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 3.55~ynh1..." # Install dependencies ynh_remove_nodejs - ynh_install_nodejs --nodejs_version=$nodejs_version + ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs # Create a dedicated systemd config @@ -157,6 +163,14 @@ if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then ynh_store_file_checksum "$config_file" fi +if ynh_version_gt "3.79~ynh1" "${previous_version}" ; then + ynh_print_info --message="Upgrading to 3.79~ynh1..." + # Install dependencies + ynh_remove_nodejs + ynh_install_nodejs --nodejs_version=$nodejsversion + ynh_use_nodejs +fi + #================================================= # CHECK THE PATH #================================================= @@ -214,7 +228,7 @@ ynh_add_nginx_config #================================================= ynh_print_info --message="Upgrading dependencies..." -ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs ynh_install_app_dependencies $pkg_dependencies From 7b36e91a5eb3fc0da591c151bb30328af48c314a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Feb 2020 21:21:10 +0100 Subject: [PATCH 05/13] Update check_process --- check_process | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 54f979c..634a3da 100644 --- a/check_process +++ b/check_process @@ -11,10 +11,18 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.98 + # 1.07~ynh2 + upgrade=1 from_commit=37d226544f2738bd37f97b612ff4798545b3dc5a + # 2.09~ynh1 + upgrade=1 from_commit=3105eb5a3c515ea55a38b8b80c9b5dda1277a82e + # 2.56~ynh2 + upgrade=1 from_commit=b26768aad2627da739677da740429591ffbb9a6e + # 2.98~ynh2 upgrade=1 from_commit=dab614bd7679f2f7978d1df2e360fba7ae0edfa4 - # 3.45 - upgrade=1 from_commit=ca58231e8488e09a2cb298f9c85e2f0387f238e6 + # 3.45~ynh1 + upgrade=1 from_commit=2e6131af03c723cf9eaf82e13aa9488f42c085f9 + # 3.55~ynh1 + upgrade=1 from_commit=3be3f1d7290b534f7689222645a42c06f3103589 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. From 748a3288f4eae8ad9888f58e4f2fc729a04b9912 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Feb 2020 22:38:00 +0100 Subject: [PATCH 06/13] Upgrade script cleanup --- scripts/upgrade | 94 ++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 76 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 81c0f89..e4c05a1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,6 +28,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION #================================================= +ynh_print_info --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -83,21 +84,6 @@ if ynh_version_gt "0.45-3" "${previous_version}" ; then yunohost service add $app fi -if ynh_version_gt "0.77-2" "${previous_version}" ; then - ynh_print_info --message="Upgrading to 0.77-2..." - ynh_install_nodejs --nodejs_version="8.9.3" - ynh_use_nodejs - - # Create a dedicated systemd config - ynh_replace_string --match_string="__NODEJS__" --replace_string="$nodejs_use_version" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$app" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__URI__" --replace_string="$path_url/" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/systemd.service" - ynh_add_systemd_config -fi - if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then ynh_print_info --message="Upgrading to 1.07~ynh2..." @@ -108,67 +94,6 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then ynh_install_app_dependencies "mongodb mongodb-server" yunohost service remove mongod yunohost service add mongodb --log "/var/log/mongodb/mongodb.log" - - # Gotta regen the systemd config because mongodb service name changed - ynh_use_nodejs - ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$nodejs_path" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="../conf/systemd.service" - ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="../conf/systemd.service" - ynh_add_systemd_config -fi - -if ynh_version_gt "2.48~ynh1" "${previous_version}" ; then - ynh_print_info --message="Upgrading to 2.48~ynh1..." - # Install dependencies - ynh_remove_nodejs - ynh_install_nodejs --nodejs_version="8.16.0" - ynh_use_nodejs - - # Create a dedicated systemd config - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/systemd.service" - ynh_add_systemd_config - - # Create a dedicated .env config - config_file="$final_path/.env" - ynh_backup_if_checksum_is_different --file="$config_file" - cp "../conf/.env" "$config_file" - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="$config_file" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file" - ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" - ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" - ynh_store_file_checksum "$config_file" -fi - -if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then - ynh_print_info --message="Upgrading to 3.55~ynh1..." - # Install dependencies - ynh_remove_nodejs - ynh_install_nodejs --nodejs_version=$nodejsversion - ynh_use_nodejs - - # Create a dedicated systemd config - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/systemd.service" - ynh_add_systemd_config - - # Create a dedicated .env config - config_file="$final_path/.env" - ynh_backup_if_checksum_is_different --file="$config_file" - cp "../conf/.env" "$config_file" - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="$config_file" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file" - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config_file" - ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" - ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" - ynh_store_file_checksum "$config_file" -fi - -if ynh_version_gt "3.79~ynh1" "${previous_version}" ; then - ynh_print_info --message="Upgrading to 3.79~ynh1..." - # Install dependencies - ynh_remove_nodejs - ynh_install_nodejs --nodejs_version=$nodejsversion - ynh_use_nodejs fi #================================================= @@ -228,6 +153,7 @@ ynh_add_nginx_config #================================================= ynh_print_info --message="Upgrading dependencies..." +ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs @@ -241,6 +167,22 @@ ynh_print_info --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_print_info --message="Modifying a config file..." + +# Create a dedicated .env config +config_file="$final_path/.env" +ynh_backup_if_checksum_is_different --file="$config_file" +cp "../conf/.env" "$config_file" +ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="$config_file" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config_file" +ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" +ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" +ynh_store_file_checksum "$config_file" + #================================================= # SETUP SYSTEMD #================================================= From 10e8e51e417046a62e69b53b34a9eeda067b3bfa Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 20 Feb 2020 19:50:06 +0100 Subject: [PATCH 07/13] Fix upgrade --- scripts/upgrade | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e4c05a1..6d143b4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,6 +96,28 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then yunohost service add mongodb --log "/var/log/mongodb/mongodb.log" fi +if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then + # Install dependencies + ynh_remove_nodejs + ynh_install_nodejs --nodejs_version="8.16.2" + ynh_use_nodejs + + # Create a dedicated systemd config + ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/systemd.service" + ynh_add_systemd_config + + # Create a dedicated .env config + config_file="$final_path/.env" + ynh_backup_if_checksum_is_different --file="$config_file" + cp "../conf/.env" "$config_file" + ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="$config_file" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file" + ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config_file" + ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" + ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" + ynh_store_file_checksum "$config_file" +fi + #================================================= # CHECK THE PATH #================================================= From 76cf2085f7b8acffafe8f1b1ee6b72151c1a1bc7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 20 Feb 2020 20:01:00 +0100 Subject: [PATCH 08/13] fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6d143b4..ac38823 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,7 +96,7 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then yunohost service add mongodb --log "/var/log/mongodb/mongodb.log" fi -if ynh_version_gt "3.55~ynh1" "${previous_version}" ; then +if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then # Install dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version="8.16.2" From 3d24d32aba59d826eb13faa109c11b3ae0d337c8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 20 Feb 2020 22:51:47 +0100 Subject: [PATCH 09/13] reorder upgrade steps --- scripts/upgrade | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ac38823..6204857 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,6 +68,22 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# CHECK THE PATH +#================================================= + +# Normalize the URL path syntax +path_url=$(ynh_normalize_url_path --path_url=$path_url) + +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_print_info --message="Stopping a systemd service..." + +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd + #================================================= # MANAGE UPGRADE FROM PREVIOUS VERSION #================================================= @@ -118,22 +134,6 @@ if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then ynh_store_file_checksum "$config_file" fi -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_print_info --message="Stopping a systemd service..." - -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From 5cea4f7540d7e282250a78189fd04857dd6977bf Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 21 Feb 2020 08:19:12 +0100 Subject: [PATCH 10/13] fix more upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6204857..3112cb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -132,6 +132,7 @@ if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" ynh_store_file_checksum "$config_file" + ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd fi #================================================= From b9ac611e5a6d5223393f0dd181c659ce49a537f3 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 21 Feb 2020 19:45:58 +0100 Subject: [PATCH 11/13] Upgrade simplification --- scripts/upgrade | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3112cb3..a3c067e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,9 +113,6 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then fi if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then - # Install dependencies - ynh_remove_nodejs - ynh_install_nodejs --nodejs_version="8.16.2" ynh_use_nodejs # Create a dedicated systemd config @@ -124,15 +121,7 @@ if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then # Create a dedicated .env config config_file="$final_path/.env" - ynh_backup_if_checksum_is_different --file="$config_file" - cp "../conf/.env" "$config_file" - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="$config_file" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file" - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config_file" - ynh_replace_string --match_string="__DOMAIN_URI__" --replace_string="$domain$path_url" --target_file="$config_file" - ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file" - ynh_store_file_checksum "$config_file" - ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd + touch $config_file fi #================================================= From f6513d862029459179689df57b517ad60c9135e7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 21 Feb 2020 22:34:32 +0100 Subject: [PATCH 12/13] fixing error Error: cannot remove currently active version (node/8.9.3) --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a3c067e..c4adafa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -165,7 +165,6 @@ ynh_add_nginx_config #================================================= ynh_print_info --message="Upgrading dependencies..." -ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs From a8cf08cb3ba6a607f841472f59f2db9bbe08c533 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 23 Feb 2020 14:53:43 +0100 Subject: [PATCH 13/13] removing nodejs to upgrade it --- scripts/upgrade | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c4adafa..fb58336 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,12 +113,6 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then fi if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then - ynh_use_nodejs - - # Create a dedicated systemd config - ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/systemd.service" - ynh_add_systemd_config - # Create a dedicated .env config config_file="$final_path/.env" touch $config_file @@ -165,6 +159,7 @@ ynh_add_nginx_config #================================================= ynh_print_info --message="Upgrading dependencies..." +ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$nodejsversion ynh_use_nodejs