From e9ba33eec1cf674414094f6ca495a8218875ec2a Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Fri, 19 Apr 2019 00:08:12 +0200
Subject: [PATCH] fix apk pinning

---
 bin/lemp.sh   | 13 ++++++++-----
 bin/zabbix.sh |  8 +++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bin/lemp.sh b/bin/lemp.sh
index 8d2d4f8..6c63b63 100755
--- a/bin/lemp.sh
+++ b/bin/lemp.sh
@@ -35,6 +35,8 @@ echo -e '
 echo -e "installing Mysql"
 sleep 3
 
+apk add mariadb mariadb-client mariadb-common
+
 # https://bugs.alpinelinux.org/issues/9046
 echo -n "are Maridb databases strored in a zfs file system? [y|n] "
 read yn
@@ -42,13 +44,14 @@ if [ "$yn" = "Y" ] || [ "$yn" = "y" ]; then
   echo -e "Stick with mariadb 10.1.x due to incompatibility of newer version with zfs"
   echo -e "Please see this bug https://bugs.alpinelinux.org/issues/9046"
   echo "http://dl-cdn.alpinelinux.org/alpine/v3.7/main" >> /etc/apk/repositories
-  echo -e "mariadb<10.1.99\nmariadb-client<10.1.99\nmariadb-common<10.1.99" >> /etc/apk/world
-  apk update
+  # echo -e "mariadb<10.1.99\nmariadb-client<10.1.99\nmariadb-common<10.1.99" >> /etc/apk/world
+  sed -i "s|mariad|mariadb<10.1.99|g" /etc/apk/world
+  sed -i "s|mariad-client|mariadb-client<10.1.99|g" /etc/apk/world
+  sed -i "s|mariad-common|mariadb-common<10.1.99|g" /etc/apk/world
+  apk update && apk upgrade
 fi
 
-apk add mariadb mariadb-client
-
-mysql_install_db --user=mysql --datadir=/var/lib/mysql
+mysql_install_db --user=mysql --datadir="/var/lib/mysql"
 
 rc-update add mariadb
 service mariadb start
diff --git a/bin/zabbix.sh b/bin/zabbix.sh
index 04e9c26..1b83a20 100755
--- a/bin/zabbix.sh
+++ b/bin/zabbix.sh
@@ -22,16 +22,18 @@ if [ ! -d "$_assets" ]; then
   fi
 fi
 
+apk add zabbix-agent
+
 echo -n "do you want to limit zabbix-agent to 3.4? [y|n] "
 read yn
 if [ "$yn" = "Y" ] || [ "$yn" = "y" ]; then
   echo -e "Stick with zabbix-agent 3.4"
   echo "http://dl-cdn.alpinelinux.org/alpine/v3.8/main" >> /etc/apk/repositories
-  echo -e "zabbix-agent<3.4.99" >> /etc/apk/world
-  apk update
+  # echo -e "zabbix-agent<3.4.99" >> /etc/apk/world
+  sed -i "s|zabbix-agent|zabbix-agent<3.4.99|g" /etc/apk/world
+  apk update && apk upgrade
 fi
 
-apk add zabbix-agent
 
 # configure
 echo -n "Please provide the current server's public ip : "