Catching up IRC -- MOTD colors; servicefile; logging; config

precommit-hooks/find-data-files

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-result="$(find roles/*/{files,templates} -type f -exec file {} \; | grep -Ev ASCII\ text\|empty\|Unicode\ text)"
+result="$(find roles/*/{files,templates} -type f -exec file {} \; | grep -Ev ASCII\ text\|empty\|Unicode\ text | grep -v motd.txt.j2)"
 if [ -n "$result" ]; then
     echo "These files need to be evaluated -- generally, don't commit data files to Git."
     echo "$result"

roles/IRC/files/services/irc.service

@@ -6,9 +6,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/lib/inspircd/inspircd.pid
-ExecStart=/usr/lib/inspircd/inspircd start
+ExecStart=/usr/bin/inspircd
-ExecReload=/usr/lib/inspircd/inspircd rehash
+ExecReload=kill -HUP $MAINPID
-ExecStop=/usr/lib/inspircd/inspircd stop
+ExecStop=kill $MAINPID
 Restart=always
 User=ircd
 Group=ircd

roles/IRC/tasks/daemon.yml

@@ -27,6 +27,22 @@
      group: ircd
      mode: 0640
 
+ - name: Copy service file
+   become: yes
+   register: servicesfile
+   copy:
+     src: services/irc.service
+     dest: /usr/lib/systemd/system/irc.service
+     owner: root
+     group: root
+     mode: 0644
+
+ - name: Reload services
+   when: servicesfile.changed
+   become: yes
+   systemd:
+     daemon_reload: true
+
  - name: Copy config and fill in attributes
    register: templatefiles
    become: yes
@@ -44,21 +60,25 @@
      - rules.txt
      - motd.txt
 
- - name: Copy service file
+ - name: Tracking directory
    become: yes
-   register: servicesfile
+   file:
-   copy:
+       dest: "/etc/inspircd/data/"
-     src: services/irc.service
+       owner: ircd
-     dest: /usr/lib/systemd/system/irc.service
+       group: ircd
-     owner: root
+       mode: 0750
-     group: root
+       state: directory
-     mode: 0644
 
- - name: Reload services
+ - name: Ensure tracking files
-   when: servicesfile.changed
    become: yes
-   systemd:
+   file:
-     daemon_reload: true
+     dest: "/etc/inspircd/{{ item }}"
+     owner: ircd
+     group: ircd
+     mode: 0600
+   loop:
+     - 'data/xline.db'
+     - 'data/permchannels.conf'
 
  - name: Ensure service running
    become: yes

roles/IRC/templates/inspircd/inspircd.conf.j2

@@ -526,7 +526,7 @@
 # The following log tag is highly default and uncustomised. It is recommended you
 # sort out your own log tags. This is just here so you get some output.
 
-<log method="file" type="* -USERINPUT -USEROUTPUT" level="default" target="/var/log/ircd.log">
+<log method="file" type="* -USERINPUT -USEROUTPUT" level="default" target="/var/log/inspircd/inspircd.log" flush="1">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-  WHOWAS OPTIONS   -#-#-#-#-#-#-#-#-#-#-#-#-#
 #                                                                     #

roles/IRC/templates/inspircd/modules.conf.j2

@@ -518,7 +518,7 @@
 # if not specified, and will always have a "-" appended.              #
 #
 <cloak mode="half"
-       key="aephu5reghufa9riN0lie4ajeesiepa"
+       key="{{ secrets['IRC']['cloakpass'] }}"
        prefix="aninix-">
 
 #-#-#-#-#-#-#-#-#-#-#-#- CLOSE MODULE #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#

roles/IRC/templates/inspircd/motd.txt.j2

@@ -1,28 +1,27 @@
-........................................
+...........................................
-........................................
+...........................................
-..................HHH...................
+.....................4HHH...................
-................HHHHHHHH................
+..................4HHHHHHHHH................
-.............HHHHHHHHHHHHH..............
+...............4HHHHHHHHHHHHHH..............
-..........HHHHHHH.....HHHHHHH...........
+...........4HHHHHHHH.....4HHHHHHHH...........
-.......HHHHHHH...........HHHHHHH........
+........4HHHHHHHH...........4HHHHHHHH........
-......HHHHH.................HHHHH.......
+.......4HHHHHH.................4HHHHHH.......
-......HHH.....................HHH.......
+.......4HHHH.....................4HHHH.......
-......HHH.....HH....#.........HHH.......
+.......4HHHH....4HHH....#.........4HHHH.......
-......HHH.....HH.....###......HHH.......
+.......4HHHH....4HHH.....###......4HHHH.......
-......HHH.....HH........##....HHH.......
+.......4HHHH....4HHH........##....4HHHH.......
-......HHH.....HH........##....HHH.......
+.......4HHHH....4HHH........##....4HHHH.......
-......HHH.....HH.....###......HHH.......
+.......4HHHH....4HHH.....###......4HHHH.......
-......HHH.....HH....#.........HHH.......
+.......4HHHH....4HHH....#.........4HHHH.......
-......HHH.....................HHH.......
+.......4HHHH.....................4HHHH.......
-......HHHHH.................HHHHH.......
+.......4HHHHHH.................4HHHHHH.......
-.......HHHHHHH...........HHHHHHH........
+........4HHHHHHHH...........4HHHHHHHH........
-..........HHHHHHH......HHHHHHH..........
+...........4HHHHHHHH......4HHHHHHHH..........
-............HHHHHHH.HHHHHHH.............
+.............4HHHHHHHH.4HHHHHHHH.............
-...............HHHHHHHHH................
+.................4HHHHHHHHHH................
-..................HHH...................
+....................4HHHH...................
-........................................
+...........................................
-........................................
+...........................................
-........................................
 
 Welcome to the AniNIX/IRC secure chat system!
 Reach out to ops and founders in #lobby if you
@@ -39,7 +38,7 @@ use the following to authenticate:
 "/quote ns identify <password>"
 
 For reference, check out the Wiki:
-https://{{ external_domain }}/AniNIX/Wiki
+4https://{{ external_domain }}/AniNIX/Wiki
 
 User code of conduct is recorded below:
-https://{{ external_domain }}/AniNIX/Wiki/src/branch/main/Policies/User_Ethics.md
+4https://{{ external_domain }}/AniNIX/Wiki/src/branch/main/Policies/User_Ethics.md

roles/SSL/files/certbot.service

@@ -2,7 +2,7 @@
 Description=Certbot
 
 [Service]
-ExecStart=certbot renew -w /var/lib/letsencrypt/ --preferred-chain "ISRG Root X1" 
+ExecStart=certbot renew -w /var/lib/letsencrypt/ --preferred-chain "ISRG Root X1"
 ExecStartPost=-/usr/bin/systemctl reload webserver
 ExecStartPost=-/usr/bin/systemctl reload irc
 KillMode=process