mg/homeserver
1
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

Domainumstellung: grote.lan -> mgrote.net (#613)

Browse source 
Reviewed-on: #613
This commit is contained in:
Michael Grote 2023-11-25 19:08:24 +01:00
parent 2ba138ab1c
commit 391ba0dee5
20 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-compose/photoprism/docker-compose.yml.j2
View file

@ -46,7 +46,7 @@ services:
PHOTOPRISM_DATABASE_NAME: "photoprism"
PHOTOPRISM_DATABASE_USER: "photoprism"
PHOTOPRISM_DATABASE_PASSWORD: "{{ lookup('keepass', 'photoprism_database_password', 'password') }}"
PHOTOPRISM_SITE_URL: "http://docker10.grote.lan:2342/"
PHOTOPRISM_SITE_URL: "http://docker10.mgrote.net:2342/"
PHOTOPRISM_SITE_TITLE: "PhotoPrism"
PHOTOPRISM_SITE_CAPTION: "Browse Your Life"
PHOTOPRISM_SITE_DESCRIPTION: ""

8
docker-compose/routeros-config-export/docker-compose.yml
View file

@ -3,7 +3,7 @@ services:
routeros-config-export:
container_name: routeros-config-export
restart: always
image: registry.mgrote.net/oxidized-selfmade:checkr
image: registry.mgrote.net/oxidized-selfmade:check
volumes:
- ./key_rb5009:/key_rb5009:ro
- ./key_hex:/key_hex:ro
@ -11,9 +11,9 @@ services:
- ./deploy_token:/deploy_token:ro
environment:
DEVICES: |-
rb5009.grote.lan,routeros-config-backup,/key_rb5009
hex.grote.lan,routeros-config-backup,/key_hex
crs305.grote.lan,routeros-config-backup,/key_crs305
rb5009.mgrote.net,routeros-config-backup,/key_rb5009
hex.mgrote.net,routeros-config-backup,/key_hex
crs305.mgrote.net,routeros-config-backup,/key_crs305
GIT_REPO_BRANCH: "master"
GIT_REPO_URL: "ssh://gitea@gitea.grote.lan:2222/mg/routeros-configs.git"
GIT_REPO_DEPLOY_KEY: "/deploy_token"

2
docker-compose/traefik/file-provider.yml
View file

@ -14,4 +14,4 @@ http:
service_gitea:
loadBalancer:
servers:
- url: "http://gitea.grote.lan:3000/"
- url: "http://gitea.mgrote.net:3000/"

2
docker-compose/woodpecker/docker-compose.yml.j2
View file

@ -13,7 +13,7 @@ services:
environment:
WOODPECKER_OPEN: false
WOODPECKER_HOST: https://ci.mgrote.net
WOODPECKER_WEBHOOK_HOST: http://docker10.grote.lan:8000
WOODPECKER_WEBHOOK_HOST: http://docker10.mgrote.net:8000
WOODPECKER_GITEA: true
WOODPECKER_GITEA_URL: https://git.mgrote.net
WOODPECKER_GITEA_CLIENT: {{ lookup('keepass', 'woodpecker-oauth2-client-id', 'password') }}

8
group_vars/all.yml
View file

@ -27,7 +27,7 @@ restic_mount_timeout: "10 min"
restic_failure_delay: "30 s"
restic_schedule: "0/6:00" # alle 6 Stunden
restic_folders_to_backup: "/" # --one-file-system ist gesetzt, also werden weitere Dateisysteme nicht eingeschlossen, es sei denn sie werden hier explizit angegeben; https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files
restic_repository: "//fileserver3.grote.lan/restic"
restic_repository: "//fileserver3.mgrote.net/restic"
restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}"
restic_mount_user: restic
restic_mount_password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}"
@ -83,7 +83,7 @@ ntp_chrony_group: _chrony # Nutzer + Gruppe für den Dienst
ntp_chrony_logging: false
### mgrote.postfix
postfix_smtp_server: docker10.grote.lan
postfix_smtp_server: docker10.mgrote.net
postfix_smtp_server_port: 1025
### mgrote.tmux
@ -152,7 +152,7 @@ apt_packages_absent:
- snapd
- ubuntu-advantage-tools
apt_packages_internet:
- http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb
- http://docker10.mgrote.net:3344/bash-helper-scripts-mgrote-latest.deb
### mgrote.zfs_sanoid
sanoid_templates:
@ -203,7 +203,7 @@ sanoid_templates:
autoprune: 'yes'
### mgrote.zfs_sanoid
sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_3.0.4.deb
sanoid_deb_url: http://docker10.mgrote.net:3344/sanoid_3.0.4.deb
# Ansible Variablen
### User

2
group_vars/fileserver.yml
View file

@ -20,7 +20,7 @@ ufw_rules:
### mgrote.apt_manage_packages
apt_packages_internet:
- http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb
- http://docker10.mgrote.net:3344/bash-helper-scripts-mgrote-latest.deb
### mgrote.fileserver_smb
smb_workgroup: WORKGROUP

4
group_vars/gitea.yml
View file

@ -74,7 +74,7 @@ gitea_db_type: sqlite3
gitea_db_path: "{{ gitea_home }}/data/gitea.db" # for sqlite3
gitea_ssh_listen: 0.0.0.0
gitea_ssh_domain: gitea.grote.lan
gitea_ssh_domain: gitea.mgrote.net
gitea_ssh_port: 2222
gitea_start_ssh: true
@ -95,7 +95,7 @@ gitea_fail2ban_jail_bantime: 600
# wird für drone benötigt, sonst wird der Webhook nicht "gesendet"
gitea_extra_config: |
[webhook]
ALLOWED_HOST_LIST = *.grote.lan
ALLOWED_HOST_LIST = *.mgrote.net
gitea_backup_on_upgrade: false
gitea_backup_location: "{{ gitea_home }}/backups/"

4
host_vars/docker10.grote.lan.yml → host_vars/docker10.mgrote.net.yml
View file

@ -21,10 +21,10 @@ cifs_mounts:
type: cifs
state: present
dest: /mnt/fileserver3_photoprism_bilder_ro
src: //fileserver3.grote.lan/bilder
src: //fileserver3.mgrote.net/bilder
user: photoprism
password: "{{ lookup('keepass', 'fileserver_smb_user_photoprism', 'password') }}"
domain: grote.lan
domain: mgrote.net
uid: 5000
gid: 5000
extra_opts: ",ro" # komma am Anfang ist notwendig weil die Option hinten angehangen wird

0
host_vars/fileserver3.grote.lan.yml → host_vars/fileserver3.mgrote.net.yml
View file

26
host_vars/pbs-test.grote.lan.yml → host_vars/pbs-test.mgrote.net.yml
View file

@ -77,67 +77,67 @@ sanoid_syncoid_ssh_privkey: "{{ lookup('keepass', 'sanoid_syncoid_private_key',
sanoid_syncoid_timer: '*-*-* *:00:00' # jede Stunde
sanoid_syncoid_bwlimit: 30m # 30MB/s
sanoid_syncoid_datasets_sync:
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/pve_backup
source_dataset: hdd_data_raidz/pve_backup
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/videos
source_dataset: hdd_data_raidz/videos
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/music
source_dataset: hdd_data_raidz/music
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/tmp
source_dataset: hdd_data_raidz/tmp
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/archiv
source_dataset: hdd_data_raidz/archiv
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/bilder
source_dataset: hdd_data_raidz/bilder
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/hm
source_dataset: hdd_data_raidz/hm
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/scans
source_dataset: hdd_data_raidz/scans
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/restic
source_dataset: hdd_data_raidz/restic
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/backup
source_dataset: hdd_data_raidz/backup
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/buecher
source_dataset: hdd_data_raidz/buecher
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/programme
source_dataset: hdd_data_raidz/programme
- source_host: pve5.grote.lan
- source_host: pve5.mgrote.net
destination_mount_check: backup
destination_dataset: backup/pve5/vm
source_dataset: hdd_data_raidz/vm

0
host_vars/pbs.grote.lan.yml → host_vars/pbs.mgrote.net.yml
View file

0
host_vars/pve5-test.grote.lan.yml → host_vars/pve5-test.mgrote.net.yml
View file

2
host_vars/pve5.grote.lan.yml → host_vars/pve5.mgrote.net.yml
View file

@ -236,7 +236,7 @@ pve_bind_mounts:
# mgrote.pbs_pve_integration
pve_pbs_datastore:
- name: pbs
server: pbs.grote.lan
server: pbs.mgrote.net
datastore: zfs_backup
username: user_pve5@pbs
password: "{{ lookup('keepass', 'pbs_pve_user', 'password') }}"

46
inventory
View file

@ -2,47 +2,47 @@ all:
children:
fileserver:
hosts:
fileserver3.grote.lan:
fileserver3.mgrote.net:
lxc:
hosts:
fileserver3.grote.lan:
fileserver3.mgrote.net:
ansible:
hosts:
ansible2.grote.lan:
ansible2.mgrote.net:
docker:
hosts:
docker10.grote.lan:
docker10.mgrote.net:
vmtest:
hosts:
vm-test-2204.grote.lan:
pbs-test.grote.lan:
pve5-test.grote.lan:
vm-test-2204.mgrote.net:
pbs-test.mgrote.net:
pve5-test.mgrote.net:
pve:
hosts:
pve5.grote.lan:
pve5-test.grote.lan:
pve5.mgrote.net:
pve5-test.mgrote.net:
pbs:
hosts:
pbs.grote.lan:
pbs-test.grote.lan:
pbs.mgrote.net:
pbs-test.mgrote.net:
physical:
hosts:
pve5.grote.lan:
pbs.grote.lan:
pve5.mgrote.net:
pbs.mgrote.net:
gitea:
hosts:
gitea.grote.lan:
gitea.mgrote.net:
production:
hosts:
fileserver3.grote.lan:
ansible2.grote.lan:
pve5.grote.lan:
gitea.grote.lan:
docker10.grote.lan:
pbs.grote.lan:
fileserver3.mgrote.net:
ansible2.mgrote.net:
pve5.mgrote.net:
gitea.mgrote.net:
docker10.mgrote.net:
pbs.mgrote.net:
test:
hosts:
vm-test-2204.grote.lan:
pve5-test.grote.lan:
pbs-test.grote.lan:
vm-test-2204.mgrote.net:
pve5-test.mgrote.net:
pbs-test.mgrote.net:

BIN
keepass_db.kdbx
View file

Binary file not shown.

2
roles/mgrote_apt_manage_packages/README.md
View file

@ -15,7 +15,7 @@ aus.
- Extra-Parameter für einzelne Hosts
apt_packages_internet:
- für URLs
- http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb
- http://docker10.mgrote.net:3344/bash-helper-scripts-mgrote-latest.deb
```

4
roles/mgrote_mount_cifs/defaults/main.yml
View file

@ -4,10 +4,10 @@ cifs_mounts:
type: cifs
state: absent
dest: /pve_backup_mount
src: //fileserver3.grote.lan/proxmox
src: //fileserver3.mgrote.net/proxmox
user: pve
password: XXXXXXXXXXXXXXX
domain: grote.lan
domain: mgrote.net
uid: 1000
gid: 1000
# optional: extra_opts: ",ro" # komma am Anfang ist notwendig weil die Option hinten angehangen wird

2
roles/mgrote_postfix/defaults/main.yml
View file

@ -1,3 +1,3 @@
---
postfix_smtp_server: docker10.grote.lan
postfix_smtp_server: docker10.mgrote.net
postfix_smtp_server_port: 1025

2
roles/mgrote_restic/defaults/main.yml
View file

@ -21,7 +21,7 @@ restic_failure_delay: "30 s"
restic_schedule: "*:0/2"
# welche ordner sollen gesichert werden
restic_folders_to_backup: "/usr/local /etc /root /var/www /home"
# smb-share mit dem repository: z.B. "//fileserver3.grote.lan/restic"
# smb-share mit dem repository: z.B. "//fileserver3.mgrote.net/restic"
restic_repository: "//fileserver.domain/restic"
# password für das repo
restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}"

4
roles/mgrote_zfs_sanoid/defaults/main.yml
View file

@ -4,7 +4,7 @@ sanoid_timer: '*-*-* *:00/5'
### when should syncoid be run
sanoid_syncoid_timer: '*-*-* *:00:00'
### where to download the package
sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_3.0.0.deb
sanoid_deb_url: http://docker10.mgrote.net:3344/sanoid_3.0.0.deb
# ### "Default" Datasets
# sanoid_datasets: # dictionary
@ -46,7 +46,7 @@ sanoid_user_group: sanoid
### mgrote.sanoid
#sanoid_syncoid_datasets_sync:
# - source_host: pve5.grote.lan
# - source_host: pve5.mgrote.net
# source_dataset: hdd_data_raidz/tmp
# destination_mount_check: hdd_data_raidz/tmp # zielpool
# destination_dataset: backup/pve5/tmp