diff options
Diffstat (limited to 'salt')
| -rw-r--r-- | salt/openbook/ansible/files/deploy-dev-env.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/database/files/installdeps.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/salt/openbook/ansible/files/deploy-dev-env.sh b/salt/openbook/ansible/files/deploy-dev-env.sh index c5a4e37..b47774e 100644 --- a/salt/openbook/ansible/files/deploy-dev-env.sh +++ b/salt/openbook/ansible/files/deploy-dev-env.sh @@ -3,7 +3,7 @@ buildroot="$(pwd)" pushd ${buildroot}/conf -cp -v /var/lib/jenkins//env.yaml.openbook . +cp ${HOME}/env.yaml.openbook . rm -f env.yaml ln -s env.yaml.openbook env.yaml popd diff --git a/salt/openbook/database/files/installdeps.sh b/salt/openbook/database/files/installdeps.sh index d752848..678e7d0 100644 --- a/salt/openbook/database/files/installdeps.sh +++ b/salt/openbook/database/files/installdeps.sh @@ -3,10 +3,10 @@ export DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 -add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main' +add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main' apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.1 xinetd +apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.2 xinetd service mysql stop service xinetd stop |