From b584e3a7bbc537ead199e9d9ad802c10a3da02b0 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 13 Apr 2018 18:37:38 +0200
Subject: [PATCH] TT#18774 Name services properly in systemd style

Let's clearly define what we are checking here, to prevent
the human mistakes due to possible .service, .path or .socket

Change-Id: I95bb7ae320fcca5655c800ac8c8281da13ee0a07
---
 templates/500_init-daemons-dabian.yaml.tt2   | 20 ++++-----
 templates/510_init-daemons-ngcp.yaml.tt2     | 46 ++++++++++----------
 templates/511_init-daemons-ngcp-pro.yaml.tt2 |  8 ++--
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2
index 608ac62..f8baba9 100644
--- a/templates/500_init-daemons-dabian.yaml.tt2
+++ b/templates/500_init-daemons-dabian.yaml.tt2
@@ -12,42 +12,42 @@ service:
     enabled: true
     running: true
 
-  cron:
+  cron.service:
     enabled: true
     running: true
 
-  exim4:
+  exim4.service:
     enabled: true
     running: true
 
-  io-scheduler:
+  io-scheduler.service:
     enabled: true
     running: true
 
-  influxdb:
+  influxdb.service:
     enabled: true
     running: true
 
-  motd:
+  motd.service:
     enabled: [% general.init_system == 'systemd' ? 'false' : 'true' %]
     running: [% general.init_system == 'systemd' ? 'false' : 'true' %]
 
-  mysql:
+  mysql.service:
     enabled: true
     running: true
 
-  ntp:
+  ntp.service:
     enabled: true
     running: true
 
-  rsyslog:
+  rsyslog.service:
     enabled: true
     running: true
 
-  ssh:
+  ssh.service:
     enabled: true
     running: true
 
-  telegraf:
+  telegraf.service:
     enabled: true
     running: true
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 3e18733..bdfbe32 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -42,137 +42,137 @@
 service:
 [% IF asterisk.enable == "yes" -%]
 
-  asterisk:
+  asterisk.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF intercept.enable == "yes" -%]
 
-  captagent:
+  captagent.service:
     enabled: false
     running: [% is_proxy || is_rtp ? 'true' : 'false' %]
 [% END -%]
 [% IF turnserver.enable == 'yes' -%]
 
-  coturn:
+  coturn.service:
     enabled: false
     running: [% is_rtp ? 'true' : 'false' %]
 [% END -%]
 [% IF bootenv.dhcp.enable == 'yes' -%]
 
-  dnsmasq:
+  dnsmasq.service:
     enabled: false
     running: [% is_mgmt ? 'true' : 'false' %]
 [% END -%]
 [% IF haproxy.enable == "yes" -%]
 
-  haproxy:
+  haproxy.service:
     enabled: false
     running: [% is_lb ? 'true' : 'false' %]
 [% END -%]
 [% IF heartbeat.hb_watchdog.enable == 'yes' -%]
 
-  hb_watchdog:
+  hb_watchdog.service:
     enabled: true
     running: true
 [% END -%]
 [% IF kamailio.lb.start == "yes" -%]
 
-  kamailio-lb:
+  kamailio-lb.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_lb && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF kamailio.proxy.start == "yes" -%]
 
-  kamailio-proxy:
+  kamailio-proxy.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF mediator.enable == 'yes' -%]
 
-  mediator:
+  mediator.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF www_admin.enable == 'yes' -%]
 
-  ngcp-panel:
+  ngcp-panel.service:
     enabled: [% is_mgmt ? 'true' : 'false' %]
     running: [% is_mgmt ? 'true' : 'false' %]
 [% END -%]
 [% IF rateomat.enable == "yes" -%]
 
-  ngcp-rate-o-mat:
+  ngcp-rate-o-mat.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF rtpproxy.enable == "yes" -%]
 
-  ngcp-rtpengine-daemon:
+  ngcp-rtpengine-daemon.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_rtp && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF sems.enable == "yes" -%]
 
-  ngcp-sems:
+  ngcp-sems.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 
-  ngcp-witnessd:
+  ngcp-witnessd.service:
     enabled: true
     running: true
 [% IF nginx.enable == 'yes' -%]
 
-  nginx:
+  nginx.service:
     enabled: true
     running: [% (is_mgmt || is_li_enabled) ? 'true' : 'false' %]
 [% END -%]
 [% IF prosody.enable == 'yes' -%]
 
-  prosody:
+  prosody.service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF pushd.enable == "yes" -%]
 
-  ngcp-pushd:
+  ngcp-pushd.service:
     enabled: true
     running: [% is_lb ? 'true' : 'false' %]
 [% END -%]
 [% IF redis.enable == "yes" -%]
 
-  redis-server:
+  redis-server.service:
     enabled: true
     running: [% (is_rtp || is_proxy || is_db) ? 'true' : 'false' %]
 [% END -%]
 [% IF ldap.enable == "yes" -%]
 
-  slapd:
+  slapd.service:
     enabled: false
     running: [% is_mgmt ? 'true' : 'false' %]
 [% END -%]
 [% IF pbx.enable == "yes" -%]
 
-  sems-pbx:
+  sems-pbx.service:
     enabled: false
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF voisniff.daemon.start == 'yes' -%]
 
-  voisniff-ng:
+  voisniff-ng.service:
     enabled: false
     running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
 [% IF is_mgmt && general.ngcp_type == 'carrier' -%]
 
-  ngcpcfg-api:
+  ngcpcfg-api.service:
     enabled: false
     running: true
 [% END -%]
 [% IF general.license_key != '' -%]
 
-  ngcp-license-client:
+  ngcp-license-client.service:
     enabled: true
     running: true
 [% END -%]
diff --git a/templates/511_init-daemons-ngcp-pro.yaml.tt2 b/templates/511_init-daemons-ngcp-pro.yaml.tt2
index 3ad76ff..cb25c8b 100644
--- a/templates/511_init-daemons-ngcp-pro.yaml.tt2
+++ b/templates/511_init-daemons-ngcp-pro.yaml.tt2
@@ -20,22 +20,22 @@
 [% END -%]
 
 service:
-  influxdb-relay:
+  influxdb-relay.service:
     enabled: true
     running: true
 
-  snmpd:
+  snmpd.service:
     enabled: true
     running: true
 
-  ngcp-snmp-agent:
+  ngcp-snmp-agent.service:
     enabled: true
     running: true
 [% IF faxserver.enable == "yes" -%]
 
   # XXX: This should be moved to the non-pro file, but the faxserver.enable
   # is incorrectly enabled on spce.
-  ngcp-faxserver:
+  ngcp-faxserver.service:
     enabled: false
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]