From 73ca80b0f67e47686315c8a9fb2405aa69269169 Mon Sep 17 00:00:00 2001
From: Rodgger <rodgger.silva@gmail.com>
Date: Fri, 25 Nov 2022 08:19:21 -0500
Subject: [PATCH] =?UTF-8?q?mudar=20nomes=20do=20binario,=20arquivos=20de?=
 =?UTF-8?q?=20configura=C3=A7=C3=A3o=20e=20permiss=C3=B5es=20de=20instala?=
 =?UTF-8?q?=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile             |  6 +++---
 etc/amid.conf        | 12 +-----------
 src/main.c           | 12 ++++++------
 src/main.h           |  2 +-
 systemd/amid.service |  2 +-
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 9a8fd5e..33ffeb4 100644
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,9 @@ install: $(PROGRAM_NAME)
 	install -d $(DESTDIR)/etc/systemd/system/
 	install -d $(DESTDIR)/usr/sbin
 
-	install -m 0744 systemd/amid.service $(DESTDIR)/etc/systemd/system/amid.service
-	install -m 0700 etc/amid.conf $(DESTDIR)/etc/amid.conf
-	install -m 0755 amid $(DESTDIR)/usr/sbin/amid
+	install -m 0644 systemd/amid.service $(DESTDIR)/etc/systemd/system/amid.service
+	install -m 0600 etc/amid.conf $(DESTDIR)/etc/amid.conf
+	install -m 4750 amid $(DESTDIR)/usr/sbin/amid
 
 .PHONY: uninstall
 uninstall:
diff --git a/etc/amid.conf b/etc/amid.conf
index 972ca64..f29bc91 100644
--- a/etc/amid.conf
+++ b/etc/amid.conf
@@ -1,11 +1,8 @@
 ####################################
-### configuração client manager ####
+### configuração AMID ####
 ####################################
 
 
-# sem opção criptografia
-
-
 # ip manager
 ip=""
 
@@ -33,11 +30,4 @@ database_port="3306"
 # Nome do banco de dados
 database_name=""
 
-# Ainda não lê
-# depois será feito
-[ExtensionState]
-
-[PresenceStateList]
-
-[Status]
 
diff --git a/src/main.c b/src/main.c
index 80e225b..dc48849 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,7 +34,7 @@
 #include <log/log.h>
 
 
-#define CLIENT_MANAGER_CONF "/etc/client_ami.conf" // arquivo de configuração desse software
+#define CLIENT_MANAGER_CONF "/etc/amid.conf" // arquivo de configuração desse software
 #define NEW_LINE '\n'
 
 
@@ -129,7 +129,7 @@ void read_arguments( s_manager *smanager){
 
 	file = open( CLIENT_MANAGER_CONF, O_RDONLY );
 	if( file == -1 ){
-		_EMERG("Arquivo /etc/client_manager/client_manager.conf não encontrado");
+		_EMERG("Arquivo /etc/client_manager/amid.conf não encontrado");
 		exit(-1);
 	}
 
@@ -374,8 +374,7 @@ int main (int argc, char **argv){
 
 	s_manager *smanager;
 	pthread_t thread;
-	init_daemon(0);
-
+ 
 	smanager = alloc( 1, sizeof(s_manager) );
 
 	/*
@@ -383,6 +382,7 @@ int main (int argc, char **argv){
 	 */
 	read_arguments( smanager );
 
+	init_daemon(0);
 	smanager->ami = ami_init(); // inicializar biblioteca ami
 	if(!smanager->ami){
 		_CRIT("Não pode calloc - library_ami");
@@ -398,14 +398,14 @@ int main (int argc, char **argv){
 		sleep(1);
 
 		if(attempt == 2){
-			_CRIT("Sem Conexão coma AMI");
+			_CRIT("Não foi possível conectar ao asterisk");
 		}
 		else if(attempt > 10){
 			attempt = 0;
 		}
 		attempt++;
 	}
-	_NOTICE("conexão com AMI");
+	_NOTICE("conectado com asterisk");
 
 	/* Essa thread é do banco de dados */
 	pthread_create(&thread, NULL, init_thread, (void *)smanager);
diff --git a/src/main.h b/src/main.h
index dda4c78..9eb8c2d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -21,7 +21,7 @@
 #ifndef MAIN
 #define MAIN 1
 
-#define NAME_PROGRAM "ami_simplesip"
+#define NAME_PROGRAM "amid"
 #include <pthread.h>
 
 #include <log/log.h>
diff --git a/systemd/amid.service b/systemd/amid.service
index 662d3ec..7f1a9d1 100644
--- a/systemd/amid.service
+++ b/systemd/amid.service
@@ -6,7 +6,7 @@ After=network.target
 Type=forking
 Restart=always
 RestartSec=2
-ExecStart=/usr/sbin/ami_simplesip
+ExecStart=/usr/sbin/amid
 
 [Install]
 WantedBy=multi-user.target