Merge pull request 'Solucionar commits de conflitos - serviços systemd' (#2) from bruno/pabx-app:dev into dev

Reviewed-on: SimplesIP/pabx-app#2
Reviewed-by: guilherme.guia <guilherme.guia@simplesip.com.br>
Reviewed-by: douglas.strappasson <douglas.strappasson@simplesip.com.br>

asterisk/var_lib_asterisk/scripts/abandonadas/rtabd.service

@@ -1,19 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-[Unit]
-Description=Servico para retorno de chamadas abandonadas automaticamente.
-After=network.target
- 
-[Service]
-Type=forking
-Restart=always
-RestartSec=3
-ExecStart=/var/lib/asterisk/scripts/abandonadas/retornoAbandonada.php
-
- 
-=======
-=======
->>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 #
 # ExecStartPre
 # If more than one command is specified, the
@@ -23,7 +7,6 @@ ExecStart=/var/lib/asterisk/scripts/abandonadas/retornoAbandonada.php
 # with "-"), other lines are not executed,
 # and the unit is considered failed.
 #
-
 [Unit]
 Description=Abandoned Return - Simple IP
 
@@ -35,16 +18,10 @@ ExecStartPre=/bin/bash -c '! /usr/bin/systemctl is-active --quiet rtabd.service'
 
 # Limpa pid em /var/lock/subsys/rtabd.pid
 ExecStartPre=/bin/bash -c "echo > /var/lock/subsys/rtabd.pid"
-
 ExecStart=/var/lib/asterisk/scripts/abandonadas/retornoAbandonada.php --log=/var/log/retornoAbandonada.log
 PIDFile=/var/lock/subsys/rtabd.pid
-
 Restart=always
 RestartSec=1
 
-<<<<<<< HEAD
->>>>>>> 43c6181 (serviço rtabd para systemd - rtadb.service)
-=======
->>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 [Install]
 WantedBy=multi-user.target

asterisk/var_lib_asterisk/scripts/supervisor/supervisor.service

@@ -7,21 +7,10 @@
 # with "-"), other lines are not executed,
 # and the unit is considered failed.
 #
-
 [Unit]
-<<<<<<< HEAD
-<<<<<<< HEAD
 Description=Service Supervisor Simples IP
 After=network.target
  
-=======
-Description=Supervisor - Simples IP
-
->>>>>>> 0ffdd2d (serviço supervisor para systemd - supervisoe.service)
-=======
-Description=Supervisor - Simples IP
-
->>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 [Service]
 Type=forking
 
@@ -29,21 +18,14 @@ Type=forking
 ExecStartPre=/bin/bash -c '! /usr/bin/systemctl is-active --quiet supervisor.service'
 
 # Limpa pid em /var/lock/subsys/superivisor.pid
-ExecStartPre=/bin/bash -c "echo > /var/lock/subsys/supervisor.pid"
+ExecStartPre=/bin/bash -c "echo > /var/lock/subsys/superivisor.pid"
+ExecStart=/var/lib/asterisk/scripts/supervisor/ssupervisor.php --log=/var/log/superivisor.log
+PIDFile=/var/lock/subsys/superivisor.pid
+Restart=always
 
-ExecStart=/var/lib/asterisk/scripts/supervisor/ssupervisor.php
-PIDFile=/var/lock/subsys/supervisor.pid
 
-Restart=always
-<<<<<<< HEAD
-RestartSec=3
-ExecStart=/var/lib/asterisk/scripts/supervisor/ssupervisor.php
-=======
 RestartSec=1
-<<<<<<< HEAD
->>>>>>> 0ffdd2d (serviço supervisor para systemd - supervisoe.service)
-=======
->>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 
 [Install]
 WantedBy=multi-user.target
+