Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor tweaks #15

Merged
merged 7 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ RUN a2enmod \
proxy \
proxy_http \
rewrite \
remoteip \
ssl && \
echo "/usr/local/lib/sogo" > /etc/ld.so.conf.d/sogo.conf && \
ldconfig && \
Expand All @@ -127,6 +128,13 @@ RUN a2enmod \
ln -s /usr/local/sbin/sogo-ealarms-notify /usr/sbin/sogo-ealarms-notify && \
ln -s /usr/local/sbin/sogo-slapd-sockd /usr/sbin/sogo-slapd-sockd && \
ln -s /etc/apache2/conf-available/SOGo.conf /etc/apache2/conf-enabled/SOGo.conf && \
{\
echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPInternalProxy 10.0.0.0/8 ;\
echo RemoteIPInternalProxy 172.16.0.0/12 ;\
echo RemoteIPInternalProxy 192.168.0.0/16 ;\
} > /etc/apache2/conf-available/remoteip.conf && \
a2enconf remoteip && \
mkdir -p /etc/cron.d /etc/default /etc/sogo /etc/logrotate.d && \
mv /usr/share/doc/sogo/sogo.cron /etc/cron.d/sogo && \
mv /usr/share/doc/sogo/sogo-default /etc/default/sogo && \
Expand Down
2 changes: 1 addition & 1 deletion charts/sogo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: sogo
version: 0.1.9
version: 0.1.10
description: A helm chart for the docker-sogo docker image
type: application
keywords:
Expand Down
11 changes: 5 additions & 6 deletions charts/sogo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ sogo:
# Array of secret names containing the configurations
# All secret values will be parsed as a string by default
# To parse a secret value as a YAML, you must append "__yaml" to the secret key
# NOTE: All keys in the secrets will be imported as a SOGo configuration.
existingSecrets: []
# - secretName1
# - secretName2
Expand Down Expand Up @@ -168,14 +169,12 @@ sogo:
size: 8Gi

## Strategy used to replace old pods
## IMPORTANT: use with care, it is suggested to leave as that for upgrade purposes
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
strategy:
type: Recreate
# type: RollingUpdate
# rollingUpdate:
# maxSurge: 1
# maxUnavailable: 0
type: RollingUpdate
rollingUpdate:
maxSurge: 1
maxUnavailable: 0

##
## Extra environment variables
Expand Down
Loading