Merge pull request #12 from 532910/systemd-units-review

review systemd units
nspcc-dev · Apr 15, 2022 · 50bb749 · 50bb749
2 parents 5132ff0 + 2178cab
commit 50bb749
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -45,14 +45,14 @@
 
 - name: Copy regular systemd unit
   ansible.builtin.template:
-    src: "neogo-legacy.service.bin.j2"
+    src: "neogo-legacy.service.j2"
     dest: "/etc/systemd/system/neogo{{ neogo__instance }}.service"
   when: not (neogo__use_compose | bool)
   notify: [ 'Restart NeoGo{{ neogo__instance }}' ]
 
 - name: Copy dockerized systemd unit
   ansible.builtin.template:
-    src: "neogo-legacy.service.compose.j2"
+    src: "neogo-legacy_compose.service.j2"
     dest: "/etc/systemd/system/neogo{{ neogo__instance }}.service"
   when: neogo__use_compose | bool
   notify: [ 'Restart NeoGo{{ neogo__instance }}' ]

diff --git a/templates/neogo-legacy.service.bin.j2 → templates/neogo-legacy.service.j2 b/templates/neogo-legacy.service.bin.j2 → templates/neogo-legacy.service.j2
@@ -1,3 +1,5 @@
+{{ ansible_managed | comment }}
+
 [Unit]
 Description=Neo Legacy node on neogo{{ neogo__instance }}
 Requires=network.target
@@ -7,12 +9,10 @@ Type=simple
 ExecStart={{ neogo__bin_path }} node --{{ neogo__network }} --config-path={{ neogo__conf_dir }}
 User={{ neogo__user }}
 Group={{ neogo__group }}
+WorkingDirectory={{ neogo__data_dir }}
 Restart=always
 RestartSec=5
-StandardError=syslog
-SyslogIdentifier=neogo{{ neogo__instance }}
 PrivateTmp=true
-WorkingDirectory={{ neogo__data_dir }}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/neogo-legacy.service.compose.j2 → templates/neogo-legacy_compose.service.j2 b/templates/neogo-legacy.service.compose.j2 → templates/neogo-legacy_compose.service.j2
@@ -1,3 +1,5 @@
+{{ ansible_managed | comment }}
+
 [Unit]
 Description=Neo Legacy node on neogo{{ neogo__instance }} in Docker
 Requires=docker.service