From 13aa8ca70085ce8ad2a04e38447143adb1dbb02a Mon Sep 17 00:00:00 2001 From: patdyn Date: Tue, 9 Jul 2024 11:43:39 +0200 Subject: [PATCH 1/3] Fix erroneous keycloak --- src/main/cljc/dda/c4k_forgejo/core.cljc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_forgejo/core.cljc b/src/main/cljc/dda/c4k_forgejo/core.cljc index 868937b..c2a19aa 100644 --- a/src/main/cljc/dda/c4k_forgejo/core.cljc +++ b/src/main/cljc/dda/c4k_forgejo/core.cljc @@ -55,7 +55,7 @@ (forgejo/generate-appini-env config) (forgejo/generate-secrets auth) (forgejo/generate-rate-limit-middleware rate-limit-defaults)] ; this does not have a vector as output - (forgejo/generate-rate-limit-ingress-and-cert (merge {:namespace "keycloak"} config)) ; this function has a vector as output + (forgejo/generate-rate-limit-ingress-and-cert (merge {:namespace "forgejo"} config)) ; this function has a vector as output (when (contains? config :restic-repository) [(backup/generate-config config) (backup/generate-secret auth) From a8e9e6f108f834a8f5236facc9245839e81510cc Mon Sep 17 00:00:00 2001 From: patdyn Date: Tue, 9 Jul 2024 11:45:38 +0200 Subject: [PATCH 2/3] release: 3.4.1 --- infrastructure/backup/build.py | 2 +- infrastructure/federated/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index dd15f9b..56c5f42 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-forgejo" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "3.4.1-dev" +version = "3.4.1" @init diff --git a/infrastructure/federated/build.py b/infrastructure/federated/build.py index bd9c397..934adc0 100644 --- a/infrastructure/federated/build.py +++ b/infrastructure/federated/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-forgejo' MODULE = 'federated' PROJECT_ROOT_PATH = '../..' -version = "3.4.1-dev" +version = "3.4.1" @init def initialize(project): diff --git a/package.json b/package.json index 010f49b..3cba186 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-forgejo", "description": "Generate c4k yaml for a forgejo deployment.", "author": "meissa GmbH", - "version": "3.4.1-SNAPSHOT", + "version": "3.4.1", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-forgejo#readme", "repository": "https://www.npmjs.com/package/c4k-forgejo", "license": "APACHE2", diff --git a/project.clj b/project.clj index 360f7e0..a886049 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.1-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.1" :description "forgejo c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From b618da8bed4d6d69a7ab0234819af46eb6de7bc3 Mon Sep 17 00:00:00 2001 From: patdyn Date: Tue, 9 Jul 2024 11:45:38 +0200 Subject: [PATCH 3/3] bump version to: 3.4.2-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/federated/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 56c5f42..9851f14 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-forgejo" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "3.4.1" +version = "3.4.2-dev" @init diff --git a/infrastructure/federated/build.py b/infrastructure/federated/build.py index 934adc0..eb3c186 100644 --- a/infrastructure/federated/build.py +++ b/infrastructure/federated/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-forgejo' MODULE = 'federated' PROJECT_ROOT_PATH = '../..' -version = "3.4.1" +version = "3.4.2-dev" @init def initialize(project): diff --git a/package.json b/package.json index 3cba186..bfb5e0a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-forgejo", "description": "Generate c4k yaml for a forgejo deployment.", "author": "meissa GmbH", - "version": "3.4.1", + "version": "3.4.2-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-forgejo#readme", "repository": "https://www.npmjs.com/package/c4k-forgejo", "license": "APACHE2", diff --git a/project.clj b/project.clj index a886049..128488f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.1" +(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.2-SNAPSHOT" :description "forgejo c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"