authorized_keys/blackdragon.keys

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLZGbt/we3JQ482/NYcdOKGoKDOj1MgmYFP2GDmjLw/ kyan@flandre

bitlair.yaml

@@ -65,9 +65,3 @@
     - { role: "acme", tags: ["acme"] }
     - { role: "nginx", tags: ["nginx"] }
     - { role: "www", tags: ["www"] }
-
-- hosts: chat
-  roles:
-    - { role: "acme", tags: [ "acme" ] }
-    - { role: "nginx", tags: [ "nginx" ] }
-    - { role: "chat", tags: [ "chat" ] }

chat.yaml

@@ -1,5 +1,3 @@
----
-
 - hosts: chat
   roles:
     - { role: "common", tags: [ "common" ] }

roles/chat/handlers/main.yaml

@@ -1,10 +0,0 @@
----
-- name: Reload systemd
-  ansible.builtin.systemd:
-    daemon_reload: yes
-
-- name: Restart thelounge
-  ansible.builtin.systemd:
-    name: thelounge
-    state: restarted
-    enabled: true

roles/chat/tasks/main.yaml

@@ -1,9 +1,7 @@
----
-
 - name: Install dependencies
   ansible.builtin.apt:
     state: present
-    pkg:
+    pkg: 
       - gpg
       - apt-transport-https
       - build-essential
@@ -16,30 +14,25 @@
     creates: /usr/share/keyrings/nodesource.gpg
   notify: Apt update
 
-- name: Ensure directories are present
+- name: Install nodesource source list
-  ansible.builtin.file:
-    path: "{{ item.path }}"
-    owner: "thelounge"
-    group: "thelounge"
-    state: "{{ item.state | default('directory') }}"
-    mode: "{{ item.mode | default('0770') }}"
-  with_items:
-    - { path: "/etc/thelounge" }
-    - { path: "/var/local/thelounge/users" }
-    - { path: "/var/local/thelounge/storage" }
-  notify:
-    - Restart thelounge
-
-- name: Configure templates
   ansible.builtin.template:
-    src: "{{ item.src }}"
+    src: nodesource.list
-    dest: "{{ item.dest }}"
+    dest: /etc/apt/sources.list.d/nodesource.list
-    owner: "{{ item.owner | default( 'thelounge' ) }}"
+    owner: root
-    group: "{{ item.group | default( 'thelounge' ) }}"
+    group: root
-    mode: "{{ item.mode | default('0640') }}"
+    mode: 0644
-  with_items:
+  notify: Apt update
-    - { src: "nodesource.list", dest: "/etc/apt/sources.list.d/nodesource.list", owner: root, group: root }
+
-    - { src: "nodejs-apt-pref", dest: "/etc/apt/preferences.d/nodejs", owner: root, group: root }
+- name: Install nodejs apt preference
+  ansible.builtin.template:
+    src: nodejs-apt-pref
+    dest: /etc/apt/preferences.d/nodejs
+    owner: root
+    group: root
+    mode: 0644
+  notify: Apt update
+
+- ansible.builtin.meta: flush_handlers
 
 - name: Install nodejs
   ansible.builtin.apt:
@@ -63,7 +56,7 @@
 
     - name: Copy patch
       ansible.builtin.template:
-        src: thelounge-bitlair.patch
+        src: thelounge-bitlair.patch    
         dest: /tmp/thelounge-bitlair.patch
 
     - name: Apply patch
@@ -76,17 +69,16 @@
   ansible.builtin.shell:
     chdir: /opt/thelounge
     cmd: yarn add sharp --ignore-engines && yarn install --include-optional sharp && NODE_ENV=production yarn build && ln -sf $(pwd)/index.js /usr/local/bin/thelounge
-  notify:
-    - Restart thelounge
 
 - name: Ensure user thelounge is present
-  ansible.builtin.user:
+  user:
     name: thelounge
     createhome: no
     comment: The Lounge (IRC client)
     system: yes
     state: present
-
+  become: yes
+      
 - name: Ensure JS and JSON syntax checking packages are installed
   yarn:
     name: "{{ item }}"
@@ -95,18 +87,57 @@
   with_items:
     - esprima
     - jsonlint
+  become: yes
   changed_when: no # FIXME: Remove when https://github.com/ansible/ansible/pull/39557 makes it in
 
-- name: Configure templates
+- name: Ensure thelounge configuration directory is present
-  ansible.builtin.template:
+  file:
-    src: "{{ item.src }}"
+    path: /etc/thelounge
-    dest: "{{ item.dest }}"
+    owner: thelounge
-    owner: "{{ item.owner | default( 'thelounge' ) }}"
+    group: thelounge
-    group: "{{ item.group | default( 'thelounge' ) }}"
+    state: directory
-    mode: "{{ item.mode | default('0640') }}"
+  become: yes
-    validate: "{{ item.validate | default([]) }}"
-  with_items:
-    - { src: "config.js.j2", dest: "/etc/thelounge/config.js", validate: 'esvalidate %s' }
-    - { src: "thelounge.service", dest: "/etc/systemd/system/thelounge.service", owner: root, group: root, notify: "Reload systemd" }
-  notify: "{{ item.notify | default('Restart thelounge') }}"
 
+- name: Ensure The Lounge is configured
+  template:
+    src: config.js.j2
+    dest: /etc/thelounge/config.js
+    owner: thelounge
+    group: thelounge
+    validate: 'esvalidate %s'
+  become: yes
+
+- name: Ensure user configuration directory is present
+  file:
+    path: /var/local/thelounge/users
+    owner: thelounge
+    group: thelounge
+    state: directory
+  become: yes
+
+- name: Ensure preview storage directory is present
+  file:
+    path: /var/local/thelounge/storage
+    owner: thelounge
+    group: thelounge
+    mode: "0770"
+    state: directory
+  become: yes
+
+- name: Copy service file to systemd directory
+  ansible.builtin.template:
+    src: thelounge.service    # Path to your service file in your Ansible project
+    dest: /etc/systemd/system/thelounge.service
+    owner: root
+    group: root
+    mode: '0644'
+  
+- name: Reload systemd daemon to read new service file
+  ansible.builtin.systemd:
+    daemon_reload: yes
+
+- name: Enable and start the service
+  ansible.builtin.systemd:
+    name: thelounge
+    state: started
+    enabled: yes

roles/chat/templates/config.js.j2

@@ -49,8 +49,8 @@ module.exports = {
         url: "{{ thelounge_ldap_url }}",
         primaryKey: "uid",
         searchDN: {
-            rootDN: "{{ lookup('passwordstore', 'chat/thelounge/ldap_rootDN subkey=binddn') }}",
+            rootDN: "{{ thelounge_ldap_rootDN }}",
-            rootPassword: "{{ lookup('passwordstore', 'chat/thelounge/ldap_rootDN') }}",
+            rootPassword: "{{ thelounge_ldap_rootPassword }}",
             filter: "{{ thelounge_ldap_filter }}",
             base: "{{ thelounge_ldap_base }}",
         },