From ae8ccb5bf6aac10a545d22121d37405a70802d57 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Wed, 17 Apr 2019 21:48:48 +0200
Subject: [PATCH] misc fix

---
 assets/zabbix/{promox-ct.conf => proxmox-ct.conf} | 0
 bin/lemp.sh                                       | 4 ++--
 bin/urbackup.sh                                   | 2 +-
 bin/zabbix.sh                                     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename assets/zabbix/{promox-ct.conf => proxmox-ct.conf} (100%)

diff --git a/assets/zabbix/promox-ct.conf b/assets/zabbix/proxmox-ct.conf
similarity index 100%
rename from assets/zabbix/promox-ct.conf
rename to assets/zabbix/proxmox-ct.conf
diff --git a/bin/lemp.sh b/bin/lemp.sh
index 3470b80..4e73020 100755
--- a/bin/lemp.sh
+++ b/bin/lemp.sh
@@ -92,8 +92,8 @@ chown -R www:www /var/lib/nginx
 chown -R www:www /var/www/html
 
 mv /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.ori
-cp "$_assets"/default.nginxconf /etc/nginx/conf.d/default.conf
-cp "$_assets"/index.php /var/www/html/
+cp "$_assets"/lemp/default.nginxconf /etc/nginx/conf.d/default.conf
+cp "$_assets"/lemp/index.php /var/www/html/
 
 rc-update add nginx
 service nginx start
diff --git a/bin/urbackup.sh b/bin/urbackup.sh
index 3660e78..4fde934 100644
--- a/bin/urbackup.sh
+++ b/bin/urbackup.sh
@@ -33,7 +33,7 @@ fi
 
 # Install the dependencies UrBackup needs
 # apt install build-essential "g++" "libcrypto++-dev" libz-dev -y
-apk add linux-headers "g++" zlib zlid-dev "crypto++@testing" "crypto++-dev@testing"
+apk add linux-headers "g++" zlib zlib-dev "crypto++@testing" "crypto++-dev@testing"
 
 ln -s /usr/lib/libcryptopp.so /usr/lib/libcryptopp.so.5.6
 
diff --git a/bin/zabbix.sh b/bin/zabbix.sh
index ebfd9ee..039f683 100755
--- a/bin/zabbix.sh
+++ b/bin/zabbix.sh
@@ -68,7 +68,7 @@ sed -i "s|#\ Include=$|Include= $_agent_conf_d|g" /etc/zabbix/zabbix_agentd.conf
 # NGINX
 # https://github.com/sfuerte/zbx-nginx
 # nginxconf already included in default.nginxconf asset
-sed -i "s/# allow CURRENT-SERVER-IP/allow $_cur_ip/g" /etc/nginx/sites-available/default
+sed -i "s/# allow CURRENT-SERVER-IP/allow $_cur_ip/g" /etc/nginx/conf.d/default.conf
 cp "$_assets"/zabbix/userparameter_nginx.conf "$_agent_conf_d"/
 mkdir /etc/zabbix/zabbix_agentd.scripts
 cp "$_assets"/zabbix/scripts/nginx-stat.py /etc/zabbix/zabbix_agentd.scripts/
@@ -86,8 +86,8 @@ ufw allow from "$_ip" to any port 22
 ufw allow from "$_ip" to any port 10050
 # ufw allow from "$_ip" to any port 10051
 
-rc-update add zabbix-agent
-service zabbix-agent restart
+rc-update add zabbix-agentd
+service zabbix-agentd restart
 
 echo -e "Zabbix-agent installed and configured, please add the host $_host_name in your zabbix-server"
 echo -e "And import requested templates in assets/zabbix/templates/"