diff --git a/.gitmodules b/.gitmodules index b754eef..39be1bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "roles/do1jlr.acmetool"] path = roles/do1jlr.acmetool url = https://github.com/DO1JLR/ansible_role_acmetool.git -[submodule "roles/do1jlr.webhost"] - path = roles/do1jlr.webhost - url = https://github.com/DO1JLR/ansible_role_acmetool.git [submodule "roles/do1jlr.ntp"] path = roles/do1jlr.ntp url = https://github.com/roles-ansible/ansible_role_ntp.git diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 9eb56fb..c12392b 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -14,9 +14,11 @@ ntp_servers: - 2.pool.ntp.org iburst - 3.pool.ntp.org iburst +local_accounts: + - video + local_users: - - name: video - pubkeys: + - video: - l3d@pinkie.l3d.yt - l3d@bsns.l3d - l3d@backup.l3d.yt @@ -29,6 +31,6 @@ acme_notification_email: "{{ unattended_mail }}" nginx__infrastructure_domain__enabled: false nginx_sites: - - name: '{{ incentory_hostname }}' + - name: '{{ inventory_hostname }}' webroot: user: 'video' diff --git a/host_vars/test.winkekatze.tv.yml b/host_vars/test.winkekatze.tv.yml new file mode 100644 index 0000000..07bc441 --- /dev/null +++ b/host_vars/test.winkekatze.tv.yml @@ -0,0 +1,3 @@ +--- +stream_name: test +stream_input_url: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/obs-misc/portier/streamkey') }}" diff --git a/roles/do1jlr.webhost b/roles/do1jlr.webhost deleted file mode 160000 index 2590767..0000000 --- a/roles/do1jlr.webhost +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25907677aaa7e9467bad04bf9576f460bf890da8