From db7c1acd583c606f753452b061dd6a5b4e22b133 Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Tue, 29 Mar 2022 20:47:27 -0400 Subject: [PATCH 1/6] Test new reply feature with TeleIRC. --- roles/jwflory.teleirc/vars/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/jwflory.teleirc/vars/main.yml b/roles/jwflory.teleirc/vars/main.yml index 3739110..ac598a3 100644 --- a/roles/jwflory.teleirc/vars/main.yml +++ b/roles/jwflory.teleirc/vars/main.yml @@ -59,7 +59,7 @@ bots: teleirc_token: "{{ vault_bots.rit.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_foss: cn: "rit-foss" @@ -72,7 +72,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_foss_admin: cn: "rit-foss-admin" @@ -85,7 +85,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss_admin.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss_admin.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_librecorps: cn: "rit-librecorps" @@ -98,7 +98,7 @@ bots: teleirc_token: "{{ vault_bots.rit_librecorps.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_librecorps.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_python: cn: "rit-python" @@ -111,7 +111,7 @@ bots: teleirc_token: "{{ vault_bots.rit_python.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_python.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_tigeros: cn: "rit-tigeros" @@ -124,7 +124,7 @@ bots: teleirc_token: "{{ vault_bots.rit_tigeros.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_tigeros.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_lug: cn: "rit-lug" @@ -137,7 +137,7 @@ bots: teleirc_token: "{{ vault_bots.rit_lug.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" rit_lug_teleirc: cn: "rit-lug-teleirc" @@ -150,5 +150,5 @@ bots: teleirc_token: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: HEAD + version: "feature/reply" From 9aa67a5594c2b308a1bb1878a2b10d383314494c Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Sun, 15 May 2022 14:50:32 -0400 Subject: [PATCH 2/6] Compile teleirc with specified branch. --- roles/jwflory.teleirc/tasks/compile.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/roles/jwflory.teleirc/tasks/compile.yml b/roles/jwflory.teleirc/tasks/compile.yml index 8664c66..f690383 100644 --- a/roles/jwflory.teleirc/tasks/compile.yml +++ b/roles/jwflory.teleirc/tasks/compile.yml @@ -9,22 +9,25 @@ - name: git clone/pull RITlug/teleirc git: repo: "https://github.com/RITlug/teleirc.git" - dest: "/tmp/teleirc" - version: "{{ default_version }}" + dest: "/tmp/teleirc/{{ item.value.cn }}" + version: "{{ item.value.version }}" accept_hostkey: yes force: yes + loop: "{{ bots|dict2items }}" - name: build teleirc binary command: cmd: bash build_binary.sh - chdir: "/tmp/teleirc/" + chdir: "/tmp/teleirc/{{ item.value.cn }}" + loop: "{{ bots|dict2items }}" - name: push teleirc binary to /usr/local/bin copy: remote_src: true - src: "/tmp/teleirc/teleirc" - dest: "/usr/local/bin/teleirc" + src: "/tmp/teleirc/{{ item.value.cn }}/teleirc" + dest: "/usr/local/bin/{{ item.value.cn }}" mode: 0755 setype: bin_t seuser: system_u + loop: "{{ bots|dict2items }}" notify: restart teleirc From ecd99642b01999ca4a7d2f3840b42695750c08f8 Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Sun, 15 May 2022 15:13:42 -0400 Subject: [PATCH 3/6] Make sure each project pulls their respective executable. --- roles/jwflory.teleirc/templates/teleirc.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/jwflory.teleirc/templates/teleirc.service b/roles/jwflory.teleirc/templates/teleirc.service index b91b677..f8534b6 100644 --- a/roles/jwflory.teleirc/templates/teleirc.service +++ b/roles/jwflory.teleirc/templates/teleirc.service @@ -6,7 +6,7 @@ After=multi-user.target [Service] Type=simple User=teleirc -ExecStart=/usr/local/bin/teleirc -conf /etc/teleirc/env-{{ item.value.cn }} +ExecStart=/usr/local/bin/{{ item.value.cn }} -conf /etc/teleirc/env-{{ item.value.cn }} Restart=always RestartSec=60 From b1cde11e6f513188abcbc02270da28724abf8492 Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Sun, 15 May 2022 15:33:03 -0400 Subject: [PATCH 4/6] Move back to default_version -- reply feature testing complete. --- roles/jwflory.teleirc/vars/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/jwflory.teleirc/vars/main.yml b/roles/jwflory.teleirc/vars/main.yml index ac598a3..4ae4825 100644 --- a/roles/jwflory.teleirc/vars/main.yml +++ b/roles/jwflory.teleirc/vars/main.yml @@ -59,7 +59,8 @@ bots: teleirc_token: "{{ vault_bots.rit.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" + rit_foss: cn: "rit-foss" @@ -72,7 +73,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_foss_admin: cn: "rit-foss-admin" @@ -85,7 +86,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss_admin.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss_admin.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_librecorps: cn: "rit-librecorps" @@ -98,7 +99,7 @@ bots: teleirc_token: "{{ vault_bots.rit_librecorps.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_librecorps.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_python: cn: "rit-python" @@ -111,7 +112,7 @@ bots: teleirc_token: "{{ vault_bots.rit_python.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_python.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_tigeros: cn: "rit-tigeros" @@ -124,7 +125,7 @@ bots: teleirc_token: "{{ vault_bots.rit_tigeros.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_tigeros.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_lug: cn: "rit-lug" @@ -137,7 +138,7 @@ bots: teleirc_token: "{{ vault_bots.rit_lug.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" rit_lug_teleirc: cn: "rit-lug-teleirc" @@ -150,5 +151,5 @@ bots: teleirc_token: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "feature/reply" + version: "{{ default_version }}" From 5232eeeca09de764f7dfffef79ad1f8e7ab35159 Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Sun, 15 May 2022 15:35:36 -0400 Subject: [PATCH 5/6] Move rit- back to HEAD. --- roles/jwflory.teleirc/vars/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/jwflory.teleirc/vars/main.yml b/roles/jwflory.teleirc/vars/main.yml index 4ae4825..4cf56fe 100644 --- a/roles/jwflory.teleirc/vars/main.yml +++ b/roles/jwflory.teleirc/vars/main.yml @@ -59,7 +59,7 @@ bots: teleirc_token: "{{ vault_bots.rit.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_foss: @@ -73,7 +73,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_foss_admin: cn: "rit-foss-admin" @@ -86,7 +86,7 @@ bots: teleirc_token: "{{ vault_bots.rit_foss_admin.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_foss_admin.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_librecorps: cn: "rit-librecorps" @@ -99,7 +99,7 @@ bots: teleirc_token: "{{ vault_bots.rit_librecorps.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_librecorps.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_python: cn: "rit-python" @@ -112,7 +112,7 @@ bots: teleirc_token: "{{ vault_bots.rit_python.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_python.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_tigeros: cn: "rit-tigeros" @@ -125,7 +125,7 @@ bots: teleirc_token: "{{ vault_bots.rit_tigeros.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_tigeros.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_lug: cn: "rit-lug" @@ -138,7 +138,7 @@ bots: teleirc_token: "{{ vault_bots.rit_lug.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD rit_lug_teleirc: cn: "rit-lug-teleirc" @@ -151,5 +151,5 @@ bots: teleirc_token: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_token }}" teleirc_chat_id: "{{ vault_bots.rit_lug_teleirc.vault_teleirc_chat_id }}" imgur_client_id: "{{ default_imgur_client_id }}" - version: "{{ default_version }}" + version: HEAD From ec11443379bf7b5f5066459e7cabe304628c001f Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Sun, 15 May 2022 15:36:27 -0400 Subject: [PATCH 6/6] Remove unneeded space. --- roles/jwflory.teleirc/vars/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/jwflory.teleirc/vars/main.yml b/roles/jwflory.teleirc/vars/main.yml index 4cf56fe..3739110 100644 --- a/roles/jwflory.teleirc/vars/main.yml +++ b/roles/jwflory.teleirc/vars/main.yml @@ -61,7 +61,6 @@ bots: imgur_client_id: "{{ default_imgur_client_id }}" version: HEAD - rit_foss: cn: "rit-foss" irc_blacklist: "CowSayBot"