Added gitlab state, fixed sshfs and created symlink to secure

merge.sh

@@ -1,4 +1,9 @@
+git checkout dev
+git merge master
+git push
+
 git checkout master
-git merge dev
+git merge --squash dev
+git commit
 git push
 git checkout dev

pillars/roles/firewalld/gitlab.sls

@@ -1,7 +1,7 @@
 firewalld:
   70_internal:
     port:
-      - 3000/tcp
+      - 8000/tcp
   99_public:
     port:
       - 5022/tcp

pillars/roles/mount/gitlab.sls

@@ -1,6 +1,6 @@
 mount:
   sshfs:
-    /var/lib/gitlab:
+    /mnt/repos:
       host: host.actcur.com
-      directory: /mnt/butter/git
+      directory: /mnt/butter/repos
-      user: git
+      user: gitlab

pillars/roles/nginx/gitlab.sls

@@ -1,6 +1,6 @@
 nginx:
-  git:
+  git2:
     auth: none
     https:
-      port: 3000
+      port: 8000
       prot: http

pillars/servers/env/server/archgitlab.sls

@@ -0,0 +1 @@
+env: prod