Abbau Dokuwiki (#602)
Reviewed-on: #602 Co-authored-by: Michael Grote <michael.grote@posteo.de> Co-committed-by: Michael Grote <michael.grote@posteo.de>
This commit is contained in:
parent
7c0c860600
commit
d3a9241d12
15 changed files with 3 additions and 42 deletions
|
@ -63,11 +63,6 @@ services:
|
|||
url: "https://nextcloud.mgrote.net"
|
||||
target: "_blank"
|
||||
subtitle: "Cloud"
|
||||
- name: "DokuWiki"
|
||||
logo: "assets/icons/dokuwiki.png"
|
||||
url: "http://dokuwiki2.grote.lan"
|
||||
target: "_blank"
|
||||
subtitle: "Wiki"
|
||||
- name: "Navidrome"
|
||||
logo: "assets/icons/navidrome.png"
|
||||
url: "https://audio.mgrote.net/mg"
|
||||
|
@ -80,7 +75,7 @@ services:
|
|||
subtitle: "Bildersammlung"
|
||||
- name: "Wiki"
|
||||
logo: "assets/icons/mkdocs.png"
|
||||
url: "http://wiki2.mgrote.net" # noch ändern
|
||||
url: "http://wiki.mgrote.net"
|
||||
target: "_blank"
|
||||
subtitle: "Wiki"
|
||||
|
||||
|
|
|
@ -2,13 +2,6 @@
|
|||
http:
|
||||
###### router #####
|
||||
routers:
|
||||
router_dokuwiki:
|
||||
rule: "Host(`dokuwiki.mgrote.net`,`wiki.mgrote.net`)"
|
||||
service: "service_dokuwiki"
|
||||
entrypoints:
|
||||
- entry_https
|
||||
tls:
|
||||
certresolver: resolver_letsencrypt
|
||||
router_gitea:
|
||||
rule: "Host(`git.mgrote.net`)"
|
||||
service: "service_gitea"
|
||||
|
@ -18,10 +11,6 @@ http:
|
|||
certresolver: resolver_letsencrypt
|
||||
###### services #####
|
||||
services:
|
||||
service_dokuwiki:
|
||||
loadBalancer:
|
||||
servers:
|
||||
- url: "http://dokuwiki2.grote.lan/"
|
||||
service_gitea:
|
||||
loadBalancer:
|
||||
servers:
|
||||
|
|
|
@ -14,7 +14,7 @@ services:
|
|||
# dieser Verzeichnis wird direkt in der wiki ci gemountet
|
||||
# und die daten werden dort reingeschrieben
|
||||
labels:
|
||||
traefik.http.routers.wiki.rule: Host(`wiki2.mgrote.net`)
|
||||
traefik.http.routers.wiki.rule: Host(`wiki.mgrote.net`)
|
||||
traefik.enable: true
|
||||
traefik.http.routers.wiki.tls: true
|
||||
traefik.http.routers.wiki.tls.certresolver: resolver_letsencrypt
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
---
|
||||
### mgrote.dokuwiki
|
||||
dokuwiki_install_path: /var/www/dokuwiki # wohin soll dokuwiki installiert werden
|
||||
dokuwiki_download_url: https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz # wo soll dokuwiki heruntergeladen werden
|
||||
dokuwiki_version_name: 2022-07-31 "Igor" # aus /var/www/dokuwiki/VERSION # welche Version, damit wird abgeglichen ob das Archiv heruntergeladen werden muss
|
||||
dokuwiki_user: www-data # dokuwiki nutzer
|
||||
dokuwiki_group: www-data # dokuwiki gruppe
|
||||
### oefenweb.ufw
|
||||
ufw_rules:
|
||||
- rule: allow
|
||||
to_port: 22
|
||||
protocol: tcp
|
||||
comment: 'ssh'
|
||||
from_ip: 0.0.0.0/0
|
||||
- rule: allow
|
||||
to_port: 80
|
||||
comment: 'dokuwiki-webserver'
|
||||
from_ip: 0.0.0.0/0
|
||||
protocol: tcp
|
|
@ -1,8 +1,5 @@
|
|||
all:
|
||||
children:
|
||||
dokuwiki:
|
||||
hosts:
|
||||
dokuwiki2.grote.lan:
|
||||
fileserver:
|
||||
hosts:
|
||||
fileserver3.grote.lan:
|
||||
|
@ -41,7 +38,6 @@ all:
|
|||
|
||||
production:
|
||||
hosts:
|
||||
dokuwiki2.grote.lan:
|
||||
fileserver3.grote.lan:
|
||||
ansible2.grote.lan:
|
||||
pve5.grote.lan:
|
||||
|
|
|
@ -28,6 +28,6 @@ restic_repository_password: "{{ lookup('keepass', 'restic_repository_password',
|
|||
# nutzer für den share
|
||||
restic_mount_user: restic
|
||||
# passwort für den mount
|
||||
restic_mount_password: "unsafe_password"
|
||||
restic_mount_password: "unsafe_password" #gitleaks:allow
|
||||
# where to send in case of an error
|
||||
restic_fail_mail: x@y.de
|
||||
|
|
Loading…
Add table
Reference in a new issue