On 07/23, Pavel Korovin wrote: > So I see 3 options: > 1) Add UPGRADE section in README with the list of deprecated config > options > 2) 1) + @ask-update > 3) 1) + @ask-update for each specific version (not sure if it even > works)
Attached the diff with the 2nd approach, OK? -- With best regards, Pavel Korovin
Index: Makefile =================================================================== RCS file: /cvs/ports/www/gitea/Makefile,v retrieving revision 1.98 diff -u -p -r1.98 Makefile --- Makefile 17 Jul 2023 15:05:57 -0000 1.98 +++ Makefile 23 Jul 2023 18:09:07 -0000 @@ -1,6 +1,6 @@ COMMENT = compact self-hosted Git service -VERSION = 1.20.0 +VERSION = 1.20.1 DISTNAME = gitea-src-${VERSION} PKGNAME = gitea-${VERSION} Index: distinfo =================================================================== RCS file: /cvs/ports/www/gitea/distinfo,v retrieving revision 1.81 diff -u -p -r1.81 distinfo --- distinfo 17 Jul 2023 15:05:57 -0000 1.81 +++ distinfo 23 Jul 2023 18:09:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (gitea-src-1.20.0.tar.gz) = ME2ZYSeaHru/7wBFBmXLpf9dKpl0WrtrmAqmzw37tq4= -SIZE (gitea-src-1.20.0.tar.gz) = 49049895 +SHA256 (gitea-src-1.20.1.tar.gz) = LYOCNZJiGuMM1ly1Sp+0F8Us8LtAXzH5NzJf2CLcHck= +SIZE (gitea-src-1.20.1.tar.gz) = 49281655 Index: patches/patch-custom_conf_app_example_ini =================================================================== RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_example_ini,v retrieving revision 1.17 diff -u -p -r1.17 patch-custom_conf_app_example_ini --- patches/patch-custom_conf_app_example_ini 17 Jul 2023 15:05:57 -0000 1.17 +++ patches/patch-custom_conf_app_example_ini 23 Jul 2023 18:09:07 -0000 @@ -1,7 +1,7 @@ Index: custom/conf/app.example.ini --- custom/conf/app.example.ini.orig +++ custom/conf/app.example.ini -@@ -47,7 +47,7 @@ +@@ -44,7 +44,7 @@ APP_NAME = ; Gitea: Git with a cup of tea ;; ;; RUN_USER will automatically detect the current user - but you can set it here change it if you run locally Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/gitea/pkg/PLIST,v retrieving revision 1.34 diff -u -p -r1.34 PLIST --- pkg/PLIST 17 Jul 2023 15:05:57 -0000 1.34 +++ pkg/PLIST 23 Jul 2023 18:09:07 -0000 @@ -1,3 +1,4 @@ +@ask-update gitea-<1.20.0 Check Upgrading section of the pkg README @newgroup _gitea:787 @newuser _gitea:787:_gitea::Gitea Account:/var/gitea:/bin/sh @rcscript ${RCDIR}/gitea Index: pkg/README =================================================================== RCS file: /cvs/ports/www/gitea/pkg/README,v retrieving revision 1.7 diff -u -p -r1.7 README --- pkg/README 9 Jan 2023 17:39:56 -0000 1.7 +++ pkg/README 23 Jul 2023 18:09:07 -0000 @@ -21,7 +21,6 @@ On OpenBSD, initial gitea configuration - Server runs in "offline" mode, which means that external services such as Gravatar/OpenID are not used - New repositories have "private" checkbox checked by default - - Password hash algorithm changed from pbkdf2 to argon2 Adjust these configuration settings according to your requirements. @@ -40,10 +39,12 @@ Relevant configuration directives in ${S # An HTTPS server using SSL/TLS server "gitea.example.com" { - listen on $ext_addr tls port 443 - tls certificate "/etc/ssl/gitea.example.com.pem" - tls key "/etc/ssl/private/gitea.example.com.key" - location "*" { fastcgi socket "/run/gitea/gitea.sock" } + root "/gitea" + listen on * tls port 443 + log style forwarded + location match "/assets/(.*)" { request rewrite "/public/%1" } + location "/public/*" { no fastcgi } + location "*" { fastcgi socket "run/gitea/gitea.sock" } } Relevant configuration directives in ${SYSCONFDIR}/gitea/app.ini: @@ -62,3 +63,37 @@ Customizing gitea ================= For custom public files, templates, gitignores, labels, licenses and READMEs, please use ${LOCALSTATEDIR}/gitea/custom directory. + +Upgrading gitea +=============== +Upgrade procedure: https://docs.gitea.com/next/installation/upgrade-from-gitea + +Check the list of deprecated configuration options below, compare gitea +configuration file ${SYSCONFDIR}/gitea/app.ini with +${TRUEPREFIX}/gitea/share/gitea/conf/app.example.ini, and the configuration +accordingly. + +Section | Option | Deprecated +--------+---------------------------------------+----------- +indexer | ISSUE_INDEXER_QUEUE_TYPE | 1.20.0 +indexer | ISSUE_INDEXER_QUEUE_DIR | 1.20.0 +indexer | ISSUE_INDEXER_QUEUE_CONN_STR | 1.20.0 +indexer | ISSUE_INDEXER_QUEUE_BATCH_NUMBER | 1.20.0 +indexer | UPDATE_BUFFER_LEN | 1.20.0 +mailer | MAILER_TYPE | 1.20.0 +mailer | IS_TLS_ENABLED | 1.20.0 +mailer | DISABLE_HELO | 1.20.0 +mailer | SKIP_VERIFY | 1.20.0 +mailer | USE_CERTIFICATE | 1.20.0 +mailer | CERT_FILE | 1.20.0 +mailer | KEY_FILE | 1.20.0 +mailer | ENABLE_HTML_ALTERNATIVE | 1.20.0 +mirror | DISABLE_MIRRORS | 1.20.0 +server | ENABLE_LETSENCRYPT | 1.20.0 +server | LETSENCRYPT_ACCEPTTOS | 1.20.0 +server | LETSENCRYPT_DIRECTORY | 1.20.0 +server | LETSENCRYPT_EMAIL | 1.20.0 +server | LFS_CONTENT_PATH | 1.20.0 +task | QUEUE_TYPE | 1.20.0 +task | QUEUE_CONN_STR | 1.20.0 +task | QUEUE_LENGTH | 1.20.0