README.md

@@ -3,12 +3,10 @@
 ansible playbook for solanum that supports hosts running debian or alpine
 
 ## setup
-- add new host to your ansible hosts file
+- add new host to your hosts file
 - run `solanum.yml` on new host to compile solanum
-- (optional) add your ssh key to ircd user
 - (optional) add your `ssl.pem` and `ssl.key` to `/home/ircd/ircd/etc/`. you probably want to make a cronjob for acme to automatically do this when the cert expires. make sure to `openssl dhparam -out dh.pem 2048` in `/home/ircd/ircd/etc/` to make safe dh parameters!
-- run `config.yml` on the whole network
+- run config.yml on the whole network
-- run `enable.yml` on new host to enable and install the service file
 - repeat steps periodically for network maintainance
 
 ## hosts ini

config.yml

@@ -1,5 +1,5 @@
 - hosts: all
-  remote_user: ircd
+  remote_user: root
 
   tasks:
     - name: check for ssl cert
@@ -27,7 +27,26 @@
         src: challenge/
         dest: /home/ircd/ircd/challenge/
 
-    - name: reload solanum
+    - name: create openrc service
-      command: killall -1 solanum
+      template:
+        src: openrc.j2
+        dest: /etc/init.d/solanum
+        mode: 0755
+      when: ansible_distribution == 'Alpine'
+
+    - name: create systemd service
+      template:
+        src: systemd.j2
+        dest: /etc/systemd/system/solanum.service
+        mode: 0755
+      when: ansible_distribution == 'Debian'
+
+    - name: enable service
+      service:
+        name: solanum
+        state: started
+        enabled: yes
       ignore_errors: yes
 
+    - name: reload solanum
+      command: killall -1 solanum

enable.yml

@@ -1,25 +0,0 @@
-- hosts: all
-  remote_user: root
-
-  tasks:
-    - name: create openrc service
-      template:
-        src: openrc.j2
-        dest: /etc/init.d/solanum
-        mode: 0755
-      when: ansible_distribution == 'Alpine'
-
-    - name: create systemd service
-      template:
-        src: systemd.j2
-        dest: /etc/systemd/system/solanum.service
-        mode: 0755
-      when: ansible_distribution == 'Debian'
-
-    - name: enable service
-      service:
-        name: solanum
-        state: started
-        enabled: yes
-      ignore_errors: yes
-

solanum.yml

@@ -59,11 +59,3 @@
       become: yes
       become_user: ircd
 
-    - name: ensure etc directory
-      file:
-        path: /home/ircd/ircd/etc
-        state: directory
-        mode: '0755'
-      become: yes
-      become_user: ircd
-