changed variable structure

This commit is contained in:
2023-06-03 02:41:34 +02:00
parent 814eeca218
commit 6c88689a5b
16 changed files with 140 additions and 159 deletions

View File

@@ -2,7 +2,7 @@
- name: Create Audiobookshelf directories if it does not exist
become: false
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/audiobookshelf/{{ item }}
path: /home/{{ system_user_name }}/docker/audiobookshelf/{{ item }}
state: directory
mode: '0755'
loop: '{{ audiobookshelf_folder }}'
@@ -22,9 +22,9 @@
- '11002:80'
env:
volumes:
- /home/{{ user['name'] }}/docker/audiobookshelf/data/audiobooks:/audiobooks
- /home/{{ user['name'] }}/docker/audiobookshelf/data/podcasts:/podcasts
- /home/{{ user['name'] }}/docker/audiobookshelf/config:/config
- /home/{{ user['name'] }}/docker/audiobookshelf/metadata:/metadata
- /home/{{ system_user_name }}/docker/audiobookshelf/data/audiobooks:/audiobooks
- /home/{{ system_user_name }}/docker/audiobookshelf/data/podcasts:/podcasts
- /home/{{ system_user_name }}/docker/audiobookshelf/config:/config
- /home/{{ system_user_name }}/docker/audiobookshelf/metadata:/metadata
networks:
- name: proxy

View File

@@ -9,9 +9,9 @@
- name: Copy smb credentials file
ansible.builtin.template:
src: "../templates/cifs.j2"
dest: "/home/{{ user['name'] }}/.cifs"
owner: "{{ user['name'] }}"
group: "{{ user['name'] }}"
dest: "/home/{{ system_user_name }}/.cifs"
owner: "{{ system_user_name }}"
group: "{{ system_user_name }}"
mode: '0600'
when: backup_via_samba == true
@@ -19,15 +19,15 @@
ansible.builtin.template:
src: "../templates/backup_to_smb.sh"
dest: /usr/local/bin/
owner: "{{ user['name'] }}"
group: "{{ user['name'] }}"
owner: "{{ system_user_name }}"
group: "{{ system_user_name }}"
mode: '0700'
when: backup_via_samba == true
- name: add cron backupjob for backups to samba server
become: true
ansible.builtin.cron:
user: "{{ user['name'] }}"
user: "{{ system_user_name }}"
name: "borgbackup the docker dir to smb share"
minute: "30"
hour: "3"
@@ -40,8 +40,8 @@
ansible.builtin.template:
src: "../templates/backup_to_nfs.sh"
dest: /usr/local/bin/
owner: "{{ user['name'] }}"
group: "{{ user['name'] }}"
owner: "{{ system_user_name }}"
group: "{{ system_user_name }}"
mode: '0700'
when: backup_via_nfs == true
@@ -49,7 +49,7 @@
- name: add cron backupjob for backups to NFS server
become: true
ansible.builtin.cron:
user: "{{ user['name'] }}"
user: "{{ system_user_name }}"
name: "borgbackup the docker dir to nfs share"
minute: "30"
hour: "4"

View File

@@ -1,7 +1,7 @@
#!/bin/bash
# Variablen
data_dir="/home/{{ user['name'] }}/docker"
data_dir="/home/{{ system_user_name }}/docker"
nfs_share="{{ nfs_share }}"
backup_target_usage_threshold="{{nfs_threshold}}" # Prozentuale Schwellenwert für die Speicherauslastung
mount_point="{{ mount_point }}"

View File

@@ -1,9 +1,9 @@
#!/bin/bash
# Variablen
data_dir="/home/{{ user['name'] }}/docker"
data_dir="/home/{{ system_user_name }}/docker"
samba_share="{{ smb_share }}"
samba_credentials="/home/{{ user['name'] }}/.cifs"
samba_credentials="/home/{{ system_user_name }}/.cifs"
backup_target_usage_threshold="{{smb_threshold}}" # Prozentuale Schwellenwert für die Speicherauslastung
mount_point="{{ mount_point }}"
backup_repository="$mount_point/{{borg_repo}}"

View File

@@ -6,15 +6,15 @@
name:
- sudo
- name: Add user "{{ user['name'] }}"
- name: Add user "{{ system_user_name }}"
ansible.builtin.user:
name: "{{ user['name'] }}"
password: "{{ user['password'] }}"
name: "{{ system_user_name }}"
password: "{{ system_user_password }}"
shell: /bin/bash
- name: Add user "{{ user['name'] }}" to sudo group
- name: Add user "{{ system_user_name }}" and join sudo group
ansible.builtin.user:
name: "{{ user['name'] }}"
user: '{{ system_user_name }}'
groups: sudo
append: yes

View File

@@ -1,7 +1,7 @@
---
- name: Add Authorized Keys
ansible.posix.authorized_key:
user: "{{ user['name'] }}"
user: "{{ system_user_name }}"
state: present
key: "{{ lookup('file', 'key.pub') }}"

View File

@@ -36,9 +36,9 @@
name: docker
state: present
- name: Add user to group docker | "{{ user['name'] }}"
- name: Add user to group docker | "{{ system_user_name }}"
ansible.builtin.user:
name: "{{ user['name'] }}"
name: "{{ system_user_name }}"
groups:
- docker
append: true
@@ -57,6 +57,6 @@
- name: Create docker dir if it does not exist
become: false
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/
path: /home/{{ system_user_name }}/docker/
state: directory
mode: '0755'

View File

@@ -2,7 +2,7 @@
- name: Create gitea directories they do not exist
become: true
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/gitea/{{ item }}
path: /home/{{ system_user_name }}/docker/gitea/{{ item }}
state: directory
mode: '0755'
loop: '{{ gitea_folder }}'
@@ -27,7 +27,7 @@
MYSQL_PASSWORD: "{{ GITEA_DB_PASS | string }}"
MYSQL_DATABASE: "{{ GITEA_DB_NAME | string }}"
volumes:
- /home/{{ user['name'] }}/docker/gitea/db:/var/lib/mysql
- /home/{{ system_user_name }}/docker/gitea/db:/var/lib/mysql
networks:
- name: gitea_internal
@@ -49,7 +49,7 @@
GITEA__database__PASSWD: "{{ GITEA_DB_PASS | string }}"
LOCAL_ROOT_URL: "{{ GITEA_ROOT_URL | string }}"
volumes:
- /home/{{ user['name'] }}/docker/gitea/data:/data
- /home/{{ system_user_name }}/docker/gitea/data:/data
networks:
- name: gitea_internal
- name: proxy

View File

@@ -2,7 +2,7 @@
- name: Create Nextcloud directories if they do not exist
become: false
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/nextcloud/{{ item }}
path: /home/{{ system_user_name }}/docker/nextcloud/{{ item }}
state: directory
mode: '0755'
loop: '{{ nextcloud_folder }}'
@@ -27,7 +27,7 @@
MYSQL_USER: "{{ NEXTCLOUD_MYSQL_USER | string }}"
MYSQL_PASSWORD: "{{ NEXTCLOUD_MYSQL_PASS | string }}"
volumes:
- /home/{{ user['name'] }}/docker/nextcloud/db:/var/lib/mysql
- /home/{{ system_user_name }}/docker/nextcloud/db:/var/lib/mysql
networks:
- name: nextcloud_internal
@@ -38,7 +38,7 @@
state: started
restart_policy: unless-stopped
volumes:
- /home/{{ user['name'] }}/docker/nextcloud/redis:/var/lib/redis
- /home/{{ system_user_name }}/docker/nextcloud/redis:/var/lib/redis
networks:
- name: nextcloud_internal
@@ -60,7 +60,7 @@
REDIS_HOST: nextcloud_redis
volumes:
- /home/{{ user['name'] }}/docker/nextcloud/data:/var/www/html
- /home/{{ system_user_name }}/docker/nextcloud/data:/var/www/html
networks:
- name: nextcloud_internal
- name: proxy

View File

@@ -2,7 +2,7 @@
- name: Create NPM directories if it does not exist
become: false
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/npm/{{ item }}
path: /home/{{ system_user_name }}/docker/npm/{{ item }}
state: directory
mode: '0755'
loop: '{{ npm_folder }}'
@@ -27,7 +27,7 @@
MYSQL_USER: "{{ NPM_MYSQL_USER | string }}"
MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}"
volumes:
- /home/{{ user['name'] }}/docker/npm/db:/var/lib/mysql
- /home/{{ system_user_name }}/docker/npm/db:/var/lib/mysql
networks:
- name: npm_internal
@@ -49,8 +49,8 @@
DB_MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}"
DB_MYSQL_NAME: "{{ NPM_MYSQL_DB | string }}"
volumes:
- /home/{{ user['name'] }}/docker/npm/data:/data
- /home/{{ user['name'] }}/docker/npm/letsencrypt:/etc/letsencrypt
- /home/{{ system_user_name }}/docker/npm/data:/data
- /home/{{ system_user_name }}/docker/npm/letsencrypt:/etc/letsencrypt
networks:
- name: npm_internal
- name: proxy

View File

@@ -2,7 +2,7 @@
- name: Create Vaultwarden directories if it does not exist
become: false
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/vaultwarden/{{ item }}
path: /home/{{ system_user_name }}/docker/vaultwarden/{{ item }}
state: directory
mode: '0755'
loop: '{{ vaultwarden_folder }}'
@@ -25,6 +25,6 @@
SIGNUPS_ALLOWED: "{{ VW_SIGNUPS_ALLOWED | string }}"
# ADMIN_TOKEN=${ADMIN_TOKEN}: "{{ VW_ADMIN_TOKEN | string }}"
volumes:
- /home/{{ user['name'] }}/docker/vaultwarden/data:/data
- /home/{{ system_user_name }}/docker/vaultwarden/data:/data
networks:
- name: proxy

View File

@@ -2,7 +2,7 @@
- name: Create Wiki_JS directories they do not exist
become: true
ansible.builtin.file:
path: /home/{{ user['name'] }}/docker/wiki_js/{{ item }}
path: /home/{{ system_user_name }}/docker/wiki_js/{{ item }}
state: directory
mode: '0755'
loop: '{{ wiki_js_folder }}'
@@ -26,7 +26,7 @@
POSTGRES_USER: "{{ WIKI_JS_POSTGRES_USER | string }}"
POSTGRES_PASSWORD: "{{ WIKI_JS_POSTGRES_PASS | string }}"
volumes:
- /home/{{ user['name'] }}/docker/wiki_js/db:/var/lib/postgresql/data
- /home/{{ system_user_name }}/docker/wiki_js/db:/var/lib/postgresql/data
networks:
- name: wiki_js_internal