Skip to content

Commit

Permalink
Merge pull request #104 from openstad/fix/auth-mail-server-secure-config
Browse files Browse the repository at this point in the history
Fix/auth mail server secure config
  • Loading branch information
Badmuts authored Oct 30, 2023
2 parents 18f64dc + 7ea709b commit ea83a65
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion k8s/openstad/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: openstad
version: 1.0.5
version: 1.0.6
appVersion: "1.0"
description: This chart deploys the OpenStad Apostrophe project with optional databases.
icon: https://openstad.org/uploads/attachments/ckf3z5imd3w4pnl3w91not6qs-favicon-2x.svg
2 changes: 1 addition & 1 deletion k8s/openstad/templates/auth/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
value: "{{ .Values.secrets.mail.auth.port }}"

- name: MAIL_SERVER_SECURE
value: "yes"
value: {{ .Values.secrets.mail.auth.secure | default "yes" }}

- name: MAIL_SERVER_PASSWORD
value: "{{ .Values.secrets.mail.auth.password }}"
Expand Down
24 changes: 9 additions & 15 deletions k8s/openstad/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ mysql:
username: openstad
database: image
existingSecret: mysql-secret

primary:
extraEnvVars:
# Use the older authentication plugin
Expand All @@ -80,8 +80,8 @@ public:

## Settings for Cert-Manager/Cluster issuer
clusterIssuer:
enabled: false # Whether this issuer is created
acme: # Email used for requesting the certificates
enabled: false # Whether this issuer is created
acme: # Email used for requesting the certificates
email: [email protected]

### If you want to use a production issuer set the following to true
Expand Down Expand Up @@ -109,7 +109,6 @@ host:
### Whether we should append www to the domains
usewww: false


## Settings for persistent volumes

persistence:
Expand All @@ -124,7 +123,6 @@ frontend:
name: "frontend"
label: openstad-frontend-service


# Service settings:
# Primarily port configuration
service:
Expand Down Expand Up @@ -199,11 +197,9 @@ frontend:
# Configure the persistent volumes for this service
volumes:
data:
size:
1Gi
size: 1Gi
uploads:
size:
1Gi
size: 1Gi

## S3 settings, backups,
## dbsToBackup would be nice to automatically get from the other values, but for now this is simpler.
Expand Down Expand Up @@ -415,7 +411,6 @@ admin:
initialDelaySeconds: 30
periodSeconds: 60


## Settings for the API server

api:
Expand Down Expand Up @@ -482,7 +477,6 @@ api:
cpu: 250m
memory: 500M


# Check whether the service is healthy:
# First time after $(initialDelaySeconds) seconds.
# After that every $(periodSeconds) seconds
Expand Down Expand Up @@ -532,8 +526,8 @@ image:
extraLabels: {}
hosts: []
tls:
secretName: openstad-tls-image
hosts: []
secretName: openstad-tls-image
hosts: []

# Inject extra environment variables
extraEnvVars: []
Expand Down Expand Up @@ -561,8 +555,7 @@ image:
# Configure the persistent volumes for this service
volumes:
data:
size:
1Gi
size: 1Gi

# Overwrite Secrets

Expand Down Expand Up @@ -637,6 +630,7 @@ secrets:
emailAssetsUrl:
user:
password:
secure: "yes"

api:
host:
Expand Down

0 comments on commit ea83a65

Please sign in to comment.