From 216b0f7cb8ed95f9151fe26fdd5355b2e110b3ad Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Mon, 19 Sep 2022 01:33:56 +0300
Subject: [PATCH] Fix config errors in `install.sh`

---
 install.sh           | 30 +++++++++++++++++-------------
 pillar/prod/salt.sls |  3 ++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/install.sh b/install.sh
index 160033b..23d1059 100755
--- a/install.sh
+++ b/install.sh
@@ -7,7 +7,7 @@ UBUNTU_CODENAME=$(grep -F VERSION_CODENAME /etc/os-release | cut -d= -f2)
 
 apt-get update
 apt-get dist-upgrade -y
-apt-get install wget gnupg -y
+apt-get install wget -y
 
 wget -qO /usr/share/keyrings/salt-archive-keyring.gpg "https://repo.saltproject.io/salt/py3/ubuntu/${UBUNTU_VERSION}/amd64/latest/salt-archive-keyring.gpg"
 
@@ -21,21 +21,25 @@ apt-get update
 apt-get install salt-master salt-minion -y
 
 cat <<EOF > /etc/salt/master
-fileserver_backend: git
+fileserver_backend:
+  - git
+
 gitfs_provider: gitpython
-gitfs_saltenv_whitelist: base
 gitfs_update_interval: 80
 
+gitfs_saltenv_whitelist:
+  - base
+
 gitfs_remotes:
-    - https://github.com/saltstack-formulas/salt-formula.git
-    - https://github.com/saltstack-formulas/cron-formula.git
-    - https://github.com/saltstack-formulas/nginx-formula.git
-    - https://github.com/saltstack-formulas/php-formula.git
-    - https://github.com/saltstack-formulas/supervisor-formula.git
-    - https://github.com/saltstack-formulas/users-formula.git
-    - https://github.com/saltstack-formulas/logrotate-formula.git
-    - https://github.com/opensourcewebsite-org/osw-devops.git:
-      - root: salt
+  - https://github.com/saltstack-formulas/salt-formula.git
+  - https://github.com/saltstack-formulas/cron-formula.git
+  - https://github.com/saltstack-formulas/nginx-formula.git
+  - https://github.com/saltstack-formulas/php-formula.git
+  - https://github.com/saltstack-formulas/supervisor-formula.git
+  - https://github.com/saltstack-formulas/users-formula.git
+  - https://github.com/saltstack-formulas/logrotate-formula.git
+  - https://github.com/opensourcewebsite-org/osw-devops.git:
+    - root: salt
 
 pillarenv_from_saltenv: True
 git_pillar_root: pillar
@@ -44,7 +48,7 @@ ext_pillar:
     - https://github.com/opensourcewebsite-org/osw-devops.git
 EOF
 
-salt-pip install -y GitPython
+salt-pip install GitPython pygit2
 
 systemctl restart salt-master
 
diff --git a/pillar/prod/salt.sls b/pillar/prod/salt.sls
index 6166afe..8be1154 100644
--- a/pillar/prod/salt.sls
+++ b/pillar/prod/salt.sls
@@ -42,7 +42,8 @@ salt:
     top_file_merging_strategy: merge
     gitfs_provider: gitpython
     git_pillar_provider: gitpython
-    gitfs_saltenv_whitelist: base
+    gitfs_saltenv_whitelist:
+      - base
     git_pillar_env: base
     git_pillar_root: pillar
     gitfs_update_interval: 63072000