Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions install.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

set -euo pipefail

UBUNTU_VERSION=$(fgrep VERSION_ID /etc/os-release | cut -d\" -f2)
UBUNTU_CODENAME=$(fgrep VERSION_CODENAME /etc/os-release | cut -d= -f2)
UBUNTU_VERSION=$(grep -F VERSION_ID /etc/os-release | cut -d\" -f2)
UBUNTU_CODENAME=$(grep -F VERSION_CODENAME /etc/os-release | cut -d= -f2)

apt-get update -y
apt-get update
apt-get dist-upgrade -y
apt-get install wget gnupg add-apt-key -y

Expand Down Expand Up @@ -74,7 +74,6 @@ gitfs_saltenv_whitelist:
base
gitfs_update_interval:
80

EOF

systemctl restart salt-master
Expand All @@ -83,9 +82,9 @@ cat <<EOF > /etc/salt/minion_id
opensourcewebsite.org
EOF

cat <<EOF >> /etc/salt/minion
master: 127.0.0.1
EOF
if ! grep -Fq 'master: 127.0.0.1' /etc/salt/minion; then
echo 'master: 127.0.0.1' >> /etc/salt/minion
fi

systemctl restart salt-minion

Expand Down