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

SYS-622 updates for authelia, ddclient, dhcp-dns-pxe, ez-ipupdate etc #161

Merged
merged 1 commit into from
Jul 2, 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
2 changes: 1 addition & 1 deletion images/ddclient/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
4 changes: 2 additions & 2 deletions images/dhcpd-dns-pxe/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
ARG DHCP_VERSION=4.4.3_p1-r4
ARG DNSMASQ_VERSION=2.90-r2
ARG DNSMASQ_VERSION=2.90-r3

ENV DHCP_BOOT=pxelinux.0 \
DHCP_ENABLE=yes \
Expand Down
4 changes: 2 additions & 2 deletions images/dhcpd-dns-pxe/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ sources:
- https://source.isc.org/git/dhcp.git
- http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
type: application
version: 0.1.10
appVersion: "4.4.3_p1-r4-2.90-r2"
version: 0.1.11
appVersion: "4.4.3_p1-r4-2.90-r3"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion images/ez-ipupdate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
2 changes: 1 addition & 1 deletion images/mythtv-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG APT_KEY=13551B881504888C
ARG MYTHTV_GID=100
ARG MYTHTV_UID=2021
ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/33
ARG MYTHTV_VERSION=2:33.1+fixes.202311120433.4112015bfe~ubuntu22.04.1
ARG MYTHTV_VERSION=2:33.1+fixes.202405301110.512d723c83~ubuntu22.04.1
ARG SSH_PORT=2022
ARG MYTHWEB_PORT=6760
ARG PPA_BRANCH=33
Expand Down
25 changes: 14 additions & 11 deletions k8s/helm/authelia/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@ metadata:
{{- include "local.labels" . | nindent 4 }}
data:
configuration.yml: |
server:
port: 80
# TODO - resolve env var conflict introduced in 4.30; requires
# enableServiceLinks=false in pod spec
# server:
# address: tcp://:80

# set to trace for troubleshooting
log:
level: {{ .Values.logLevel }}

authentication_backend:
ldap:
url: ldap://ldap
address: ldap://ldap
base_dn: {{ .Values.baseDN }}
users_filter: (&({username_attribute}={input})(objectClass=inetOrgPerson))
username_attribute: uid
additional_users_dn: ou=users
additional_groups_dn: ou=groups
display_name_attribute: sn
attributes:
display_name: sn
group_name: cn
mail: mail
username: uid
groups_filter: (&(member={dn})(objectclass=groupOfNames))
group_name_attribute: cn
mail_attribute: mail
user: cn=admin,{{ .Values.baseDN }}

# Access Control
Expand All @@ -49,6 +53,7 @@ data:
session:
expiration: {{ .Values.session.expiration }}
inactivity: {{ .Values.session.inactivity }}
# TODO this is deprecated with little info about how to fix it
domain: {{ .Values.session.domain }}
redis:
host: redis
Expand All @@ -63,15 +68,13 @@ data:
# The directory where the DB files will be saved
storage:
mysql:
host: {{ .Values.mysql.host }}
port: {{ .Values.mysql.port }}
address: {{ .Values.mysql.address }}
database: {{ .Values.mysql.database }}
username: {{ .Values.mysql.username }}

# Configuration of the notification system.
notifier:
smtp:
address: {{ .Values.smtp.address }}
username: {{ .Values.smtp.username }}
host: {{ .Values.smtp.host }}
port: {{ .Values.smtp.port }}
sender: {{ .Values.smtp.sender }}
8 changes: 3 additions & 5 deletions k8s/helm/authelia/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,23 @@ bypassUser: "user:username"
domains: [ example.com ]
logLevel: info
mysql:
host: db00
port: 3306
address: tcp://db00:3306
database: authelia
username: authelia
session:
domain: example.com
expiration: 2w
inactivity: 5m
smtp:
host: smtp.gmail.com
port: 587
address: submission://smtp.gmail.com:587
sender: [email protected]
username: [email protected]
tlsHostname: authelia.example.com

deployment:
containerPorts: [ containerPort: 80 ]
env:
authelia_jwt_secret_file: /config/secrets/jwt_secret
authelia_identity_validation_reset_password_jwt_secret_file: /config/secrets/jwt_secret
authelia_session_secret_file: /config/secrets/session_secret
authelia_session_redis_password_file: /config/secrets/redis_password
authelia_storage_mysql_password_file: /config/secrets/mysql_password
Expand Down
Loading