Skip to content

Commit 7c54f28

Browse files
steveiliop56steveiliop56
committed
fix: use correct config options for v5
1 parent 7efb3e2 commit 7c54f28

4 files changed

Lines changed: 68 additions & 47 deletions

File tree

‎charts/tinyauth/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The tiniest authentication and authorization server you have ever seen.
5858
| serviceAccount.automount | bool | `true` | |
5959
| serviceAccount.create | bool | `true` | |
6060
| serviceAccount.name | string | `""` | |
61+
| tinyauth.analytics.enabled | bool | `true` | |
6162
| tinyauth.appUrl | string | `""` | |
6263
| tinyauth.auth.ip.allow | string | `""` | |
6364
| tinyauth.auth.ip.block | string | `""` | |
@@ -69,9 +70,7 @@ The tiniest authentication and authorization server you have ever seen.
6970
| tinyauth.auth.trustedProxies | string | `""` | |
7071
| tinyauth.auth.users | string | `""` | |
7172
| tinyauth.auth.usersFile | string | `""` | |
72-
| tinyauth.databasePath | string | `"/data/tinyauth.db"` | |
73-
| tinyauth.disableAnalytics | bool | `false` | |
74-
| tinyauth.disableResources | bool | `false` | |
73+
| tinyauth.database.path | string | `"/data/tinyauth.db"` | |
7574
| tinyauth.ldap.address | string | `""` | |
7675
| tinyauth.ldap.authCert | string | `""` | |
7776
| tinyauth.ldap.authKey | string | `""` | |
@@ -116,14 +115,15 @@ The tiniest authentication and authorization server you have ever seen.
116115
| tinyauth.oidc.clients[0].trustedRedirectUris | string | `""` | |
117116
| tinyauth.oidc.privateKeyPath | string | `""` | |
118117
| tinyauth.oidc.publicKeyPath | string | `""` | |
119-
| tinyauth.resourcesDir | string | `"/data/resources"` | |
118+
| tinyauth.resources.enabled | bool | `true` | |
119+
| tinyauth.resources.path | string | `"/data/resources"` | |
120120
| tinyauth.server.address | string | `"0.0.0.0"` | |
121121
| tinyauth.server.port | int | `3000` | |
122122
| tinyauth.server.socketPath | string | `""` | |
123123
| tinyauth.ui.backgroundImage | string | `"/background.jpg"` | |
124-
| tinyauth.ui.disableWarnings | bool | `false` | |
125124
| tinyauth.ui.forgotPasswordMessage | string | `"You can change your password by changing the configuration."` | |
126125
| tinyauth.ui.title | string | `"Tinyauth"` | |
126+
| tinyauth.ui.warningsEnabled | bool | `true` | |
127127
| tolerations | list | `[]` | |
128128
| volumeMounts | list | `[]` | |
129129
| volumes | list | `[]` | |

‎charts/tinyauth/templates/deployment.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ spec:
5050
- name: TINYAUTH_APPURL
5151
value: {{ .Values.tinyauth.appUrl | quote }}
5252
{{- end }}
53-
{{- if .Values.tinyauth.resourcesDir }}
54-
- name: TINYAUTH_RESOURCESDIR
55-
value: {{ .Values.tinyauth.resourcesDir | quote }}
53+
{{- if .Values.tinyauth.resources.path }}
54+
- name: TINYAUTH_RESOURCES_PATH
55+
value: {{ .Values.tinyauth.resources.path | quote }}
5656
{{- end }}
57-
{{- if .Values.tinyauth.databasePath }}
58-
- name: TINYAUTH_DATABASEPATH
59-
value: {{ .Values.tinyauth.databasePath | quote }}
57+
{{- if .Values.tinyauth.database.path }}
58+
- name: TINYAUTH_DATABASE_PATH
59+
value: {{ .Values.tinyauth.database.path | quote }}
6060
{{- end }}
61-
{{- if .Values.tinyauth.disableAnalytics }}
62-
- name: TINYAUTH_DISABLEANALYTICS
63-
value: {{ .Values.tinyauth.disableAnalytics | quote }}
61+
{{- if .Values.tinyauth.analytics.enabled }}
62+
- name: TINYAUTH_ANALYTICS_ENABLED
63+
value: {{ .Values.tinyauth.analytics.enabled | quote }}
6464
{{- end }}
65-
{{- if .Values.tinyauth.disableResources }}
66-
- name: TINYAUTH_DISABLERESOURCES
67-
value: {{ .Values.tinyauth.disableResources | quote }}
65+
{{- if .Values.tinyauth.resources.enabled }}
66+
- name: TINYAUTH_RESOURCES_ENABLED
67+
value: {{ .Values.tinyauth.resources.enabled | quote }}
6868
{{- end }}
6969
# server config
7070
{{- if .Values.tinyauth.server.port }}
@@ -231,9 +231,9 @@ spec:
231231
- name: TINYAUTH_UI_BACKGROUNDIMAGE
232232
value: {{ .Values.tinyauth.ui.backgroundImage | quote }}
233233
{{- end }}
234-
{{- if .Values.tinyauth.ui.disableWarnings }}
235-
- name: TINYAUTH_UI_DISABLEWARNINGS
236-
value: {{ .Values.tinyauth.ui.disableWarnings | quote }}
234+
{{- if .Values.tinyauth.ui.warningsEnabled }}
235+
- name: TINYAUTH_UI_WARNINGSENABLED
236+
value: {{ .Values.tinyauth.ui.warningsEnabled | quote }}
237237
{{- end }}
238238
# ldap config
239239
{{- if .Values.tinyauth.ldap.address }}

‎charts/tinyauth/values.schema.json‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,15 @@
340340
"appUrl"
341341
],
342342
"properties": {
343+
"analytics": {
344+
"type": "object",
345+
"properties": {
346+
"enabled": {
347+
"default": true,
348+
"type": "boolean"
349+
}
350+
}
351+
},
343352
"appUrl": {
344353
"default": "",
345354
"type": "string"
@@ -394,17 +403,14 @@
394403
}
395404
}
396405
},
397-
"databasePath": {
398-
"default": "/data/tinyauth.db",
399-
"type": "string"
400-
},
401-
"disableAnalytics": {
402-
"default": false,
403-
"type": "boolean"
404-
},
405-
"disableResources": {
406-
"default": false,
407-
"type": "boolean"
406+
"database": {
407+
"type": "object",
408+
"properties": {
409+
"path": {
410+
"default": "/data/tinyauth.db",
411+
"type": "string"
412+
}
413+
}
408414
},
409415
"ldap": {
410416
"type": "object",
@@ -655,9 +661,18 @@
655661
}
656662
}
657663
},
658-
"resourcesDir": {
659-
"default": "/data/resources",
660-
"type": "string"
664+
"resources": {
665+
"type": "object",
666+
"properties": {
667+
"enabled": {
668+
"default": true,
669+
"type": "boolean"
670+
},
671+
"path": {
672+
"default": "/data/resources",
673+
"type": "string"
674+
}
675+
}
661676
},
662677
"server": {
663678
"type": "object",
@@ -683,17 +698,17 @@
683698
"default": "/background.jpg",
684699
"type": "string"
685700
},
686-
"disableWarnings": {
687-
"default": false,
688-
"type": "boolean"
689-
},
690701
"forgotPasswordMessage": {
691702
"default": "You can change your password by changing the configuration.",
692703
"type": "string"
693704
},
694705
"title": {
695706
"default": "Tinyauth",
696707
"type": "string"
708+
},
709+
"warningsEnabled": {
710+
"default": true,
711+
"type": "boolean"
697712
}
698713
}
699714
}

‎charts/tinyauth/values.yaml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,20 @@ service:
4949
tinyauth:
5050
# The base URL where the app is hosted.
5151
appUrl: "" # @schema default: ""; required: true
52-
# The directory where resources are stored.
53-
resourcesDir: "/data/resources" # @schema default: "/data/resources"
54-
# The path to the database file.
55-
databasePath: "/data/tinyauth.db" # @schema default: "/data/tinyauth.db"
56-
# Disable analytics.
57-
disableAnalytics: false # @schema default: false
58-
# Disable resources server.
59-
disableResources: false # @schema default: false
52+
53+
# Resources config
54+
resources:
55+
path: "/data/resources" # @schema default: "/data/resources"
56+
enabled: true # @schema default: true
57+
58+
# Database config
59+
database:
60+
path: "/data/tinyauth.db" # @schema default: "/data/tinyauth.db"
61+
62+
# Analytics config
63+
analytics:
64+
# Disable analytics.
65+
enabled: true # @schema default: true
6066

6167
# server config
6268
server:
@@ -142,7 +148,7 @@ tinyauth:
142148
# Path to the background image.
143149
backgroundImage: "/background.jpg" # @schema default: "/background.jpg"
144150
# Disable UI warnings.
145-
disableWarnings: false # @schema default: false
151+
warningsEnabled: true # @schema default: true
146152

147153
# ldap config
148154
ldap:

0 commit comments

Comments
 (0)