roles/autossh/tasks/main.yaml

@@ -19,13 +19,16 @@
     - id_ed25519
     - id_rsa
 
-- name: "create {{ autossh_etc_path }}"
+- name: create directories
   file:
-    path: "{{ autossh_etc_path }}"
+    path: "{{ item }}"
     owner: root
     group: root
     mode: 0755
     state: directory
+  loop:
+    - "{{ autossh_etc_path }}"
+    - "{{ autossh_run_path }}"
 
 - name: install package
   package:

roles/autossh/templates/autossh.j2

@@ -4,6 +4,5 @@ AUTOSSH_POLL=60
 AUTOSSH_FIRST_POLL=30
 AUTOSSH_GATETIME=0
 AUTOSSH_PORT=22000
-AUTOSSH_PIDFILE={{ autossh_run_path }}/{{ item.name }}.pid
 SSH_OPTIONS="{{ item.options | join(' ') }}"
 SSH_HOST={{ item.host }}

roles/autossh/templates/autossh.service.j2

@@ -10,10 +10,9 @@ Type=simple
 User={{ autossh_user }}
 EnvironmentFile={{ autossh_etc_path }}/%i
 ExecStart=
-ExecStart=/usr/bin/autossh -M 0 -C -q -l {{ autossh_user }} -N -o ExitOnForwardFailure=yes -o ServerAliveInterval=15 -o ServerAliveCountMax=3 -o StrictHostKeyChecking=no $SSH_OPTIONS $SSH_HOST
+ExecStart=/usr/bin/autossh -C -q -l {{ autossh_user }} -N -o ExitOnForwardFailure=yes -o ServerAliveInterval=15 -o ServerAliveCountMax=3 -o StrictHostKeyChecking=no $SSH_OPTIONS $SSH_HOST
 Restart=always
 RestartSec=60
-RuntimeDirectory=autossh
 PIDFile={{ autossh_run_path }}/%i.pid
 
 [Install]

roles/gitea/defaults/main.yaml

@@ -11,6 +11,7 @@ gitea_bin_path: /usr/local/bin
 gitea_var_path: /var/lib/gitea
 gitea_log_path: /var/log/gitea
 gitea_etc_path: /etc/gitea
+gitea_run_path: /run/gitea
 gitea_path: "{{ gitea_bin_path }}/gitea"
 gitea_config_path: "{{ gitea_etc_path }}/app.ini"
 gitea_systemd_unit_path: /etc/systemd/system/gitea.service

roles/gitea/tasks/main.yaml

@@ -58,6 +58,14 @@
     state: directory
   with_items: "{{ gitea_var_tree }}"
 
+- name: "create {{ gitea_run_path }} path"
+  file:
+    path: "{{ gitea_run_path }}"
+    owner: "{{ gitea_user }}"
+    group: "{{ gitea_group }}"
+    mode: 0755
+    state: directory
+
 - name: "create {{ gitea_log_path }} path"
   file:
     path: "{{ gitea_log_path }}"

roles/gitea/templates/gitea.service.j2

@@ -55,7 +55,7 @@ Group={{ gitea_group }}
 WorkingDirectory={{ gitea_var_path }}
 # If using Unix socket: tells systemd to create the /run/gitea folder, which will contain the gitea.sock file
 # (manually creating /run/gitea doesn't work, because it would not persist across reboots)
-RuntimeDirectory=gitea
+#RuntimeDirectory=gitea
 ExecStart={{ gitea_path }} web --config {{ gitea_config_path }}
 Restart=always
 Environment=USER={{ gitea_user }} HOME={{ gitea_home_path }} GITEA_WORK_DIR={{ gitea_var_path }}

roles/grafana/defaults/main.yaml

@@ -11,7 +11,7 @@ grafana_etc_path: /etc/grafana
 grafana_config_path: "{{ grafana_etc_path }}/grafana.ini"
 
 grafana_domain: "stats.{{ ansible_domain }}"
-grafana_port: 3002
+grafana_port: "stats.{{ ansible_domain }}"
 grafana_user: grafana
 grafana_group: grafana
 

roles/rsyslog/tasks/archival.yaml

@@ -4,20 +4,6 @@
     rsyslog_default_rules_state: absent
   when: rsyslog_archival_format_enabled
 
-- name: configure systemd tmpfiles.d
-  template:
-    src: tmpfiles_d-rsyslog.conf
-    dest: /etc/tmpfiles.d/00rsyslog.conf
-    owner: root
-    group: root
-    mode: 0644
-  when: rsyslog_archival_format_enabled
-
-- name: manage systemd tmpfiles.d override
-  file:
-    path: /etc/tmpfiles.d/00rsyslog.conf
-    state: "{{ rsyslog_archival_format_enabled | ternary('file', 'absent') }}"
-
 - name: find default log files
   find:
     path: /var/log
@@ -26,12 +12,12 @@
   when: rsyslog_archival_format_enabled
   register: default_log_files
 
-- name: delete files
-  file:
-    path: "{{ item.path }}"
-    state: "{{ rsyslog_archival_format_enabled | ternary('absent', 'file') }}"
-  when: rsyslog_archival_format_enabled
-  with_items: "{{ default_log_files.files }}"
+-  name: delete files
+   file:
+     path: "{{ item.path }}"
+     state: "{{ rsyslog_archival_format_enabled | ternary('absent', 'file') }}"
+   when: rsyslog_archival_format_enabled
+   with_items: "{{ default_log_files.files }}"
 
 - name: delete logrotate configuration
   file:

roles/rsyslog/templates/rsyslog.conf.j2

@@ -28,16 +28,16 @@ $FileOwner {{ rsyslog_file_owner }}
 $FileGroup {{ rsyslog_file_group }}
 {% endif %}
 {% if rsyslog_dir_owner is defined %}
-$DirOwner {{ rsyslog_dir_owner }}
+$FileOwner {{ rsyslog_dir_owner }}
 {% endif %}
 {% if rsyslog_dir_group is defined %}
-$DirGroup {{ rsyslog_dir_group }}
+$FileGroup {{ rsyslog_dir_group }}
 {% endif %}
 {% if rsyslog_file_create_mode is defined %}
 $FileCreateMode {{ rsyslog_file_create_mode }}
 {% endif %}
 {% if rsyslog_create_dirs is defined %}
-$CreateDirs {{ rsyslog_create_dirs | ternary('on', 'off') }}
+CreateDirs {{ rsyslog_create_dirs | ternary('on', 'off') }}
 {% endif %}
 {% if rsyslog_dir_create_mode is defined %}
 $DirCreateMode {{ rsyslog_dir_create_mode }}

roles/rsyslog/templates/tmpfiles_d-rsyslog.conf

@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-d /var/log/syslog {{ rsyslog_dir_create_mode }} {{ rsyslog_dir_owner }} {{ rsyslog_dir_group }} -