浏览代码

fix apk pinning

Bachir Soussi Chiadmi 5 年之前
父节点
当前提交
e9ba33eec1
共有 2 个文件被更改,包括 13 次插入8 次删除
  1. 8 5
      bin/lemp.sh
  2. 5 3
      bin/zabbix.sh

+ 8 - 5
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

+ 5 - 3
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 : "