diff --git a/.sourceignore b/.sourceignore index 1ba9dc9..caa0374 100644 --- a/.sourceignore +++ b/.sourceignore @@ -7,3 +7,6 @@ !apps/production/branding/favicon.ico !apps/production/branding/favicons/favicon-32x32.png !apps/production/branding/favicons/favicon-16x16.png +!apps/production/branding/favicons/android-chrome-192x192.png +!apps/production/branding/favicons/apple-touch-icon.png +!apps/production/branding/favicons/mstile-150x150.png diff --git a/apps/production/branding/favicons/android-chrome-192x192.png b/apps/production/branding/favicons/android-chrome-192x192.png new file mode 100644 index 0000000..cb7ad33 Binary files /dev/null and b/apps/production/branding/favicons/android-chrome-192x192.png differ diff --git a/apps/production/branding/favicons/apple-touch-icon.png b/apps/production/branding/favicons/apple-touch-icon.png new file mode 100644 index 0000000..c82d97b Binary files /dev/null and b/apps/production/branding/favicons/apple-touch-icon.png differ diff --git a/apps/production/branding/favicons/mstile-150x150.png b/apps/production/branding/favicons/mstile-150x150.png new file mode 100644 index 0000000..43ab379 Binary files /dev/null and b/apps/production/branding/favicons/mstile-150x150.png differ diff --git a/apps/production/kustomization.yaml b/apps/production/kustomization.yaml index ce630f0..f3df647 100644 --- a/apps/production/kustomization.yaml +++ b/apps/production/kustomization.yaml @@ -97,7 +97,15 @@ configMapGenerator: namespace: matrix files: - branding/logo.png - - branding/alpenglow.jpg - branding/favicon.ico - branding/favicons/favicon-32x32.png - branding/favicons/favicon-16x16.png + - branding/favicons/android-chrome-192x192.png + - branding/favicons/apple-touch-icon.png + - branding/favicons/mstile-150x150.png + # Hintergrundbild separat: alpenglow.jpg (604 KB) würde die obige ConfigMap ans + # 1-MiB-Limit bringen. Eigene ConfigMap, eigener Mount-Pfad (/_assets/img/bg/). + - name: platform-branding-bg + namespace: matrix + files: + - branding/alpenglow.jpg diff --git a/apps/production/wikijs-config.py b/apps/production/wikijs-config.py index f29c629..86df6b0 100644 --- a/apps/production/wikijs-config.py +++ b/apps/production/wikijs-config.py @@ -199,7 +199,7 @@ def ensure_theming(jwt: str): # wikijs.yaml + platform-branding ConfigMap): öffentlich ausgeliefert, kein read:assets # für Guests, keine externe URL. Dark als Default (#0050). logo = "/_assets/img/branding/logo.png" - bg = "/_assets/img/branding/alpenglow.jpg" + bg = "/_assets/img/bg/alpenglow.jpg" tc = gql('{theming{config{theme iconset darkMode tocPosition injectCSS injectHead injectBody}}}', jwt)["theming"]["config"] gql('mutation($t:String!,$i:String!,$d:Boolean!,$tp:String,$c:String,$h:String,$b:String){' diff --git a/apps/production/wikijs.yaml b/apps/production/wikijs.yaml index e32cf37..9382535 100644 --- a/apps/production/wikijs.yaml +++ b/apps/production/wikijs.yaml @@ -66,6 +66,9 @@ spec: - name: branding mountPath: /wiki/assets/img/branding readOnly: true + - name: branding-bg + mountPath: /wiki/assets/img/bg + readOnly: true # Favicon (#0050): serve-favicon liest /wiki/assets/favicon.ico; der # Browser-Tab nutzt zusätzlich die PNGs unter /_assets/favicons/. Einzelne # Dateien per subPath überlagern, ohne die restlichen Default-Favicons zu verdecken. @@ -81,6 +84,18 @@ spec: mountPath: /wiki/assets/favicons/favicon-16x16.png subPath: favicon-16x16.png readOnly: true + - name: branding + mountPath: /wiki/assets/favicons/android-chrome-192x192.png + subPath: android-chrome-192x192.png + readOnly: true + - name: branding + mountPath: /wiki/assets/favicons/apple-touch-icon.png + subPath: apple-touch-icon.png + readOnly: true + - name: branding + mountPath: /wiki/assets/favicons/mstile-150x150.png + subPath: mstile-150x150.png + readOnly: true readinessProbe: tcpSocket: port: http @@ -98,6 +113,9 @@ spec: - name: branding configMap: name: platform-branding + - name: branding-bg + configMap: + name: platform-branding-bg --- apiVersion: v1 kind: Service