webserver/docker_uffd/templates/uffd.cfg

@@ -91,6 +91,14 @@ SERVICES=[
 #		'logo_url': 'https://grafana.{{ global_domains.warpzonems.domain }}/public/img/fav32.png'
 #    },
 
+	{
+		'title': 'Dokuwiki',
+		'description': 'warpzone Wiki',
+		'url': 'https://wiki.{{ global_domains.warpzonems.domain }}',
+		'logo_url': 'https://wiki.{{ global_domains.warpzonems.domain }}/_media/wiki:dokuwiki.svg',
+		'required_group': 'dokuwiki_access',
+		'confidential': True
+	},
     {
 			'title': 'Gitea (Verwaltung)',
 			'description': 'Gitea für Verwaltungsdaten',
@@ -104,7 +112,7 @@ SERVICES=[
 			'title': 'Gitlab',
 			'description': 'Gitlab Server',
 			'url': 'https://gitlab.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://about.gitlab.com/nuxt-images/ico/favicon-192x192.png',
+			'logo_url': 'https://gitlab.{{ global_domains.warpzonems.domain }}/assets/apple-touch-icon-b049d4bc0dd9626f31db825d61880737befc7835982586d015bded10b4435460.png',
 			'required_group': 'gitlab_access',
 			'confidential': True
     },
@@ -113,7 +121,7 @@ SERVICES=[
 			'title': 'HedgeDoc',
 			'description': 'HedgeDoc, ehemals: CodiMD / HackMD',
 			'url': 'https://md.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://avatars.githubusercontent.com/u/67865462?s=280&v=4',
+			'logo_url': 'https://md.{{ global_domains.warpzonems.domain }}/icons/apple-touch-icon.png',
 			'required_group': 'hackmd_access',
 			'confidential': True
     },
@@ -122,7 +130,7 @@ SERVICES=[
 			'title': 'Icinga',
 			'description': 'Icinga Monitoring',
 			'url': 'https://icinga.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://icinga.com/wp-content/uploads/2020/11/cropped-icinga-favicon-512x512px-192x192.png',
+			'logo_url': 'https://icinga.{{ global_domains.warpzonems.domain }}/icingaweb2/img/touch-icon.png',
 			'required_group': 'icinga_access',
 			'confidential': True
     },
@@ -136,22 +144,21 @@ SERVICES=[
 			'confidential': True
     },
 
-    {
-			'title': 'Mailu (Mailserver)',
-			'description': 'Mailu Mailserver - Administration und Webmail',
-			'url': 'https://mailserver.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://avatars.githubusercontent.com/u/23010996?s=280&v=4',
-			'confidential': True
-    },
-
+#    {
+#			'title': 'Mailu (Mailserver)',
+#			'description': 'Mailu Mailserver - Administration und Webmail',
+#			'url': 'https://mailserver.{{ global_domains.warpzonems.domain }}',
+#			'logo_url': 'https://avatars.githubusercontent.com/u/23010996?s=280&v=4',
+#			'confidential': True
+#    },
     {
 			'title': 'Mailman (Mailinglisten)',
 			'description': 'Mailman Mailinglistenverwaltung',
 			'url': 'https://listserver.{{ global_domains.warpzonems.domain }}',
 			'logo_url': 'https://list.org/images/logo2010-2.jpg',
+			'required_group': 'mailman_access',
 			'confidential': True
     },
-
     {
 			'title': 'Nextcloud',
 			'description': 'Nextcloud Cloud Storage',
@@ -174,23 +181,16 @@ SERVICES=[
 			'title': 'Vaultwarden',
 			'description': 'Vaultwarden Passwortverwaltung',
 			'url': 'https://vault.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://canada1.discourse-cdn.com/free1/uploads/vaultwarden/original/1X/26a1c808c7d5849039d47820eef7889b3415e5ec.png'
+			'logo_url': 'https://vault.{{ global_domains.warpzonems.domain }}/images/apple-touch-icon.png',
+			'required_group': 'verwaltung',
+			'confidential': True
     },
-
     {
 			'title': 'Warpapi',
-      'description': 'API für Services wie SpaceAPI etc.', 
+      		'description': 'API für Services wie SpaceAPI etc.', 
 			'url': 'https://api.{{ global_domains.warpzonems.domain }}',
 			'logo_url': 'https://gitlab.warpzone.ms/presse/media/-/raw/master/Logo/WZ_Blume_3c.svg'
     },
-
-    {
-			'title': 'Wiki',
-			'description': 'Dokuwiki für allgemeine Dokumentation',
-			'url': 'https://wiki.{{ global_domains.warpzonems.domain }}',
-			'logo_url': 'https://gitlab.warpzone.ms/presse/media/-/raw/master/Logo/WZ_Blume_3c.svg'
-    },
-
     {
 			'title': 'Wordpress',
 			'description': 'Wordpress Webseiten Verwaltung',
@@ -222,7 +222,7 @@ ORGANISATION_NAME='Warpzone'
 ORGANISATION_CONTACT='admin@{{ mail_domains.warpzonems.maildomain }}'
 
 # Optional text included in account registration mails (plain text only!)
-WELCOME_TEXT='Warpzone uffd Server'
+WELCOME_TEXT='Wenn ihr Hilfe braucht meldet euch beim admin team unter admin@warpzone.ms oder sprecht uns an.'
 
 
 # DO set in production

webserver/docker_vpnserver/templates/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - "WG_VPN_CIDRV6=0" # to disable IPv6
       - "WG_EXTERNAL_HOST={{ domain }}"
       - "WG_DNS_ENABLED=true"
-      - "WG_DNS_UPSTREAM=10.0.0.1"
+      - "WG_DNS_UPSTREAM=192.168.0.201"
       - "WG_LOG_LEVEL=info"
     labels:
       - traefik.enable=true