From 53fc0e0cb345dd7ec669b28844cf672aed645819 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 21 Feb 2024 01:38:06 +0100 Subject: [PATCH] Create first WK24 Stuff --- README.md | 6 ++++++ group_vars/obs/vars.yml | 26 ++++++++++++++------------ host_vars/obs-hall1.yml | 2 ++ host_vars/obs-hall2.yml | 2 ++ host_vars/obs-hall3.yml | 2 ++ hosts.ini | 3 ++- requirements.txt | 8 ++++++++ site.yml | 6 +++--- 8 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 host_vars/obs-hall1.yml create mode 100644 host_vars/obs-hall2.yml create mode 100644 host_vars/obs-hall3.yml create mode 100644 requirements.txt diff --git a/README.md b/README.md index fcf2679..49c03d7 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ Next Release will be for "Winterkongress 2024" Requirements --------------- +### On ansible +``` +pip install --upgrade -r requirements.txt +``` + +### On Windows Your Windows 10 Host has the following Software Requirements bevore starting ansible usage *(based on [windows_setup.html#host-requirements](https://docs.ansible.com/ansible/latest/user_guide/windows_setup.html#host-requirements)*: + PowerShell version 3.0 or newer + .NET Framework 4.0 or newer diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 7ca41a6..75c0ce7 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -1,7 +1,9 @@ --- # user for ansible login ansible_user: ansible -voc_user: voc +voc_user: obs + +win_obs_init__user: "{{ voc_user }}" # language options (important) win_base_init__os_language: 'en' @@ -42,32 +44,32 @@ wallpaper_path: 'C:\obs\{{ win_obs_szene__project }}\background_logo_big.png' win_obs_szene_files: - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_3sources.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_3sources.png' file: 'background_3sources.png' - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_plain.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_plain.png' file: 'background_4sources.png' - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_logo_pip.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_logo_pip.png' file: 'background_pip.png' - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_sbs.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_sbs.png' file: 'background_sbs.png' - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_logo_big.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_logo_big.png' file: 'background_logo_big.png' - - src: 'https://backwesen.de/voc/wk23-obs-szene/media/branch/main/artwork/background_final_plain.png' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/artwork/background_final_plain.png' file: 'background_plain.png' - src: 'https://files.zerobyte.ch/files/hidden/dgwk22_music/luss%20dub%20techno%20session%205.mp3' file: 'wk22_background_music.mp3' - src: 'https://www.latofonts.com/download/lato2ofl-zip/' file: 'Lato2OFL.zip' - - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/wk23-{{ inventory_hostname }}.json' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/wk23-{{ inventory_hostname }}.json' file: 'wk23-{{ inventory_hostname }}.json' - - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/profile/streamEncoder.json' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/streamEncoder.json' file: 'obs-config/streamEncoder.json' - - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/profile/service.json' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/service.json' file: 'obs-config/service.json' - - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/profile/basic.ini' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/basic.ini' file: 'obs-config/basic.ini' win_streamdeck__download_icons: true win_streamdeck__icons: - - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/WK23.streamDeckProfile' + - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/WK23.streamDeckProfile' file: 'WK23.streamDeckProfile' diff --git a/host_vars/obs-hall1.yml b/host_vars/obs-hall1.yml new file mode 100644 index 0000000..b8538ba --- /dev/null +++ b/host_vars/obs-hall1.yml @@ -0,0 +1,2 @@ +--- +# ansible_user: 'voc' diff --git a/host_vars/obs-hall2.yml b/host_vars/obs-hall2.yml new file mode 100644 index 0000000..b8538ba --- /dev/null +++ b/host_vars/obs-hall2.yml @@ -0,0 +1,2 @@ +--- +# ansible_user: 'voc' diff --git a/host_vars/obs-hall3.yml b/host_vars/obs-hall3.yml new file mode 100644 index 0000000..b8538ba --- /dev/null +++ b/host_vars/obs-hall3.yml @@ -0,0 +1,2 @@ +--- +# ansible_user: 'voc' diff --git a/hosts.ini b/hosts.ini index 3b36be9..1a397af 100644 --- a/hosts.ini +++ b/hosts.ini @@ -1,2 +1,3 @@ [obs] -obs-aula ansible_host="obs-aula.local" +obs-hall2 ansible_host="192.168.42.231" +obs-hall3 ansible_host="172.30.0.3" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..883f266 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,8 @@ +jmespath>=1.0.1 +passlib[bcrypt]>=1.7.4 +ansible +ansible-core >= 2.16.0 +ansible-lint +yamllint +j2lint +netaddr >= 0.9.0 diff --git a/site.yml b/site.yml index 8f37400..b99b60f 100644 --- a/site.yml +++ b/site.yml @@ -20,6 +20,6 @@ - {role: do1jlr.win_parsec, tags: parsec} - {role: do1jlr.win_streamdeck, tags: streamdeck} - {role: do1jlr.win_reaplugs236, tags: [reaper, obs, reaplugs236, reaplugs]} - - {role: do1jlr.win_obs_szene, tags: [obs, szene]} - - {role: do1jlr.win_nextcloud, tags: nextcloud} - - {role: setup_secrets, tags: [secret]} +# - {role: do1jlr.win_obs_szene, tags: [obs, szene]} + # - {role: do1jlr.win_nextcloud, tags: nextcloud} +# - {role: setup_secrets, tags: [secret]}