From 8fc796517b6c41965b6fac3805070a3bd554cf02 Mon Sep 17 00:00:00 2001
From: Serj <evasive.gyron@gmail.com>
Date: Tue, 5 Feb 2019 16:59:54 +0000
Subject: [PATCH] [FS-11674] Use systemd native RunAs User

---
 debian/freeswitch-systemd.freeswitch.service | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/freeswitch-systemd.freeswitch.service b/debian/freeswitch-systemd.freeswitch.service
index 594ef913d2..e44852c942 100644
--- a/debian/freeswitch-systemd.freeswitch.service
+++ b/debian/freeswitch-systemd.freeswitch.service
@@ -10,15 +10,17 @@ After=network.target network-online.target local-fs.target
 ; service
 Type=forking
 PIDFile=/run/freeswitch/freeswitch.pid
-Environment="DAEMON_OPTS=-nonat"
+Environment="DAEMON_OPTS=-ncwait -nonat"
+Environment="USER=freeswitch"
+Environment="GROUP=freeswitch"
 EnvironmentFile=-/etc/default/freeswitch
-ExecStartPre=/bin/chown -R freeswitch:freeswitch /var/lib/freeswitch /var/log/freeswitch /etc/freeswitch /usr/share/freeswitch /var/run/freeswitch
-ExecStart=/usr/bin/freeswitch -u freeswitch -g freeswitch -ncwait $DAEMON_OPTS
+ExecStartPre=/bin/chown -R ${USER}:${GROUP} /var/lib/freeswitch /var/log/freeswitch /etc/freeswitch /usr/share/freeswitch /var/run/freeswitch
+ExecStart=/usr/bin/freeswitch ${DAEMON_OPTS}
 TimeoutSec=45s
 Restart=always
 ; exec
-User=root
-Group=daemon
+User=${USER}
+Group=${GROUP}
 LimitCORE=infinity
 LimitNOFILE=100000
 LimitNPROC=60000