From ca89818cc1b4a9336a6d9855c1e6f951add136aa Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Tue, 23 Apr 2024 16:39:43 +0100 Subject: [PATCH] Update Greenlock packageRoot path in StatusPageCerts.ts and app.yaml --- .gitignore | 5 ++++- .../Workers/Jobs/StatusPageCerts/StatusPageCerts.ts | 2 +- App/greenlock/README.md | 1 + HelmChart/Public/oneuptime/templates/app.yaml | 7 +++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 App/greenlock/README.md diff --git a/.gitignore b/.gitignore index aba949a8e3..7aab14875f 100644 --- a/.gitignore +++ b/.gitignore @@ -107,4 +107,7 @@ InfrastructureAgent/build/* InfrastructureAgent/err.log InfrastructureAgent/out.log -InfrastructureAgent/daemon.pid \ No newline at end of file +InfrastructureAgent/daemon.pid +App/greenlock/.greenlockrc +App/greenlock/greenlock.d/config.json +App/greenlock/greenlock.d/config.json.bak diff --git a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts index 30887b4571..9d32d1216d 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts @@ -23,7 +23,7 @@ const router: ExpressRouter = Express.getRouter(); const greenlock: any = Greenlock.create({ configFile: '/usr/src/app/FeatureSet/Workers/greenlockrc', - packageRoot: `/usr/src/app`, + packageRoot: `/usr/src/app/greenlock`, manager: '/usr/src/app/FeatureSet/Workers/Utils/Greenlock/Manager.ts', approveDomains: async (opts: any) => { const domain: StatusPageDomain | null = diff --git a/App/greenlock/README.md b/App/greenlock/README.md new file mode 100644 index 0000000000..d7df89edae --- /dev/null +++ b/App/greenlock/README.md @@ -0,0 +1 @@ +# This directory is for the .greenlockrc file \ No newline at end of file diff --git a/HelmChart/Public/oneuptime/templates/app.yaml b/HelmChart/Public/oneuptime/templates/app.yaml index 9d292663e7..985f4fb204 100644 --- a/HelmChart/Public/oneuptime/templates/app.yaml +++ b/HelmChart/Public/oneuptime/templates/app.yaml @@ -22,6 +22,10 @@ spec: date: "{{ now | unixEpoch }}" appname: oneuptime spec: + volumes: + - name: greenlockrc + emptyDir: + sizeLimit: "1Gi" {{- if $.Values.podSecurityContext }} securityContext: {{- $.Values.podSecurityContext | toYaml | nindent 8 }} {{- end }} @@ -37,6 +41,9 @@ spec: containers: - image: {{ printf "%s/%s/%s:%s" $.Values.image.registry $.Values.image.repository "app" $.Values.image.tag }} name: {{ printf "%s-%s" $.Release.Name "app" }} + volumeMounts: + - name: greenlockrc + mountPath: "/usr/src/app/greenlock/.greenlockrc" {{- if $.Values.containerSecurityContext }} securityContext: {{- $.Values.containerSecurityContext | toYaml | nindent 12 }} {{- end }}