Skip to content

Commit bffcfdd

Browse files
committed
WIP
1 parent afe030d commit bffcfdd

File tree

2 files changed

+16
-166
lines changed

2 files changed

+16
-166
lines changed

ansible/playbook_main.yml

Lines changed: 0 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -9,167 +9,12 @@
99
main_user: "clang"
1010
main_password: "{{ passwords.clang }}"
1111

12-
- ansible.builtin.import_tasks: tasks/ubuntu_apt.yml
13-
- ansible.builtin.import_tasks: tasks/basic_setup.yml
14-
1512
roles:
16-
- role: users
17-
vars:
18-
users:
19-
- {name: "{{ main_user }}", password: "{{ main_password }}"}
20-
- {name: "velin", password: "{{ passwords.velin }}"}
21-
22-
- role: ssh
23-
vars:
24-
ssh_pub_files:
25-
- 'eddsa-key-clang-privat-20220905.opub'
26-
- 'eddsa-key-clang-scs-20220830.opub'
27-
- 'eddsa-key-technical-user-20230806.opub'
2813

29-
- role: git-tools
30-
vars:
31-
git_graphical_tools: false
32-
git_aliases: true
33-
git_rerere: true
34-
git_editor_nano: true
35-
git_prompt: true
36-
git_user_name: "Christian Lang"
37-
git_user_email: "[email protected]"
38-
39-
- role: bash
40-
- role: tmux
41-
42-
- role: btrfs
43-
vars:
44-
volumes:
45-
- label: "pool-main"
46-
mount_path: "/mnt/pool-main"
47-
mkfs_options: "--data raid1 --metadata raid1"
48-
status_log_path: "/mnt/pool-main/subvolumes/share-main"
49-
devices:
50-
- "/dev/sda"
51-
- "/dev/sdb"
52-
- "/dev/sdc"
53-
subvolumes:
54-
- "share-main"
5514

56-
- role: btrbk
57-
vars:
58-
btrbk_pool_label: "pool-main"
59-
btrbk_mount_path: "/mnt/pool-main"
60-
btrbk_subvolumes:
61-
- name: "share-main"
62-
snapshot_preserve_min: "1h"
63-
snapshot_preserve: "24h 14d 5w 3m"
64-
timer_OnCalendar: "*-*-* *:00,30:00"
65-
66-
- role: share
67-
vars:
68-
share_source: "/mnt/pool-main/subvolumes/share-main"
69-
70-
- role: user_folders
71-
vars:
72-
folders:
73-
- "/config"
74-
- "/git"
75-
- "/share-common"
76-
- "/share-common/Temp/"
77-
- "/share/web/"
78-
- "/share/web/fileshare/"
79-
- "/share/web/gallery/"
80-
81-
- role: rsync
82-
vars:
83-
rsync_jobs:
84-
- name: "backups-{{ hostname_main }}"
85-
user: "{{ main_user }}"
86-
timer_OnCalendar: "*-*-* *:20:00"
87-
steps:
88-
- { src: "/config", dest: "/share/backups/{{ hostname_main }}/config", opts: '--rsync-path="sudo rsync"' }
89-
- { src: "/git", dest: "/share/backups/{{ hostname_main }}/git" }
90-
- { src: "/share-common", dest: "/share/backups/{{ hostname_main }}/share-common" }
91-
92-
- role: rsync-daemon
93-
vars:
94-
rsyncd_destination_modules_path: "/share/backups"
95-
rsyncd_destination_modules:
96-
- user_name: "{{ main_user }}"
97-
user_password: "{{ main_password }}"
98-
subfolders:
99-
- 'lang-ct21'
100-
- 'lang-xps13'
101-
- user_name: 'velin'
102-
user_password: "{{ passwords.velin }}"
103-
subfolders:
104-
- 'lang-mate'
105-
106-
- role: ansible-collection-vladgh-samba
107-
become: true
108-
vars:
109-
samba_mitigate_cve_2017_7494: false
110-
samba_global_include: "samba-global-include.conf"
111-
samba_users:
112-
- name: "{{ main_user }}"
113-
password: "{{ main_password }}"
114-
- name: "velin"
115-
password: "{{ passwords.velin }}"
116-
samba_shares:
117-
- name: "share-main"
118-
path: "/mnt/pool-main/subvolumes/share-main"
119-
browseable: true
120-
owner: "{{ main_user }}"
121-
group: "users"
122-
write_list: "{{ main_user }}"
123-
- name: "snapshots"
124-
path: "/mnt/pool-main/snapshots"
125-
browseable: true
126-
owner: "{{ main_user }}"
127-
group: "users"
128-
- name: "share-common"
129-
path: "/share-common"
130-
browseable: true
131-
owner: "{{ main_user }}"
132-
group: "users"
133-
write_list: "{{ main_user }} velin"
134-
135-
- role: disk-monitoring
136-
vars:
137-
disk_monitoring_status_log_path: "/share"
138-
disk_monitoring_devices:
139-
- path: '/dev/sda'
140-
- path: '/dev/sdb'
141-
- path: '/dev/sdc'
142-
- path: '/dev/nvme0n1'
143-
144-
- role: dockerio
145-
146-
- role: ddclient
147-
vars:
148-
cloudflare_api_token: "{{ passwords.cloudflare_api_token }}"
149-
- role: duckdns
150-
vars:
151-
ddns_token: "{{ passwords.duckdns }}"
152-
153-
- role: adguard
154-
vars:
155-
adguard_user: "{{ main_user }}"
156-
adguard_password: "{{ main_password }}"
157-
158-
- role: transmission
159-
- role: jdownloader
160-
vars:
161-
myjd_password: "{{ passwords.myjd }}"
16215
- role: lms
16316
vars:
16417
lms_music_folder: "/share/Audios/"
16518
lms_additional_music_folder: "/share-common/Temp"
16619

16720
- role: caddy
168-
- role: web_examples
169-
- role: wiki
170-
- role: mumble
171-
- role: bitwarden
172-
- role: mosquitto
173-
- role: homeassistant
174-
- role: jellyfin
175-
- role: jellyseerr

ansible/roles/caddy/templates/Caddyfile

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
(abort_non_local) {
2-
@non_local {
3-
not remote_ip private_ranges
4-
}
5-
abort @non_local
6-
}
7-
8-
lms.{{ domain }} lms.{{ domain2 }} {
9-
import abort_non_local
10-
reverse_proxy lms:9000
11-
}
1+
#(abort_non_local) {
2+
# @non_local {
3+
# not remote_ip private_ranges
4+
# }
5+
# abort @non_local
6+
#}
7+
#
8+
#lms.{{ domain }} lms.{{ domain2 }} {
9+
# #log {
10+
# # output stderr
11+
# # level DEBUG
12+
# # format console
13+
# #}
14+
# import abort_non_local
15+
# reverse_proxy lms:9000
16+
#}
1217

1318
# needed for certificate
1419
mumble.{{ domain }} mumble.{{ domain2 }} {

0 commit comments

Comments
 (0)