Added gitlab state, fixed sshfs and created symlink to secure

2017-08-21 20:30:08 +00:00 · 2017-08-21 20:30:08 +00:00 · 51a7806ef3
commit 51a7806ef3
parent 1939d9c4e9
312 changed files with 2494 additions and 38 deletions
--- a/merge.sh
+++ b/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
--- a/pillars/roles/aurpkgs/calendar.sls
+++ b/pillars/roles/aurpkgs/calendar.sls
--- a/pillars/roles/aurpkgs/git.sls
+++ b/pillars/roles/aurpkgs/git.sls
--- a/pillars/roles/aurpkgs/headphones.sls
+++ b/pillars/roles/aurpkgs/headphones.sls
--- a/pillars/roles/aurpkgs/init.sls
+++ b/pillars/roles/aurpkgs/init.sls
--- a/pillars/roles/aurpkgs/jackett.sls
+++ b/pillars/roles/aurpkgs/jackett.sls
--- a/pillars/roles/aurpkgs/lam.sls
+++ b/pillars/roles/aurpkgs/lam.sls
--- a/pillars/roles/aurpkgs/none.sls
+++ b/pillars/roles/aurpkgs/none.sls
--- a/pillars/roles/aurpkgs/ombi.sls
+++ b/pillars/roles/aurpkgs/ombi.sls
--- a/pillars/roles/aurpkgs/plexmediaserver.sls
+++ b/pillars/roles/aurpkgs/plexmediaserver.sls
--- a/pillars/roles/aurpkgs/portal.sls
+++ b/pillars/roles/aurpkgs/portal.sls
--- a/pillars/roles/aurpkgs/radarr.sls
+++ b/pillars/roles/aurpkgs/radarr.sls
--- a/pillars/roles/aurpkgs/sonarr.sls
+++ b/pillars/roles/aurpkgs/sonarr.sls
--- a/pillars/roles/firewalld/certbot.sls
+++ b/pillars/roles/firewalld/certbot.sls
--- a/pillars/roles/firewalld/core.sls
+++ b/pillars/roles/firewalld/core.sls
--- a/pillars/roles/firewalld/deluge.sls
+++ b/pillars/roles/firewalld/deluge.sls
--- a/pillars/roles/firewalld/git.sls
+++ b/pillars/roles/firewalld/git.sls
--- a/pillars/roles/firewalld/gitlab.sls
+++ b/pillars/roles/firewalld/gitlab.sls
@ -1,7 +1,7 @@
 firewalld:
  70_internal:
    port:
-      - 3000/tcp
+      - 8000/tcp
  99_public:
    port:
      - 5022/tcp
--- a/pillars/roles/firewalld/init.sls
+++ b/pillars/roles/firewalld/init.sls
--- a/pillars/roles/firewalld/nginx-proxy.sls
+++ b/pillars/roles/firewalld/nginx-proxy.sls
--- a/pillars/roles/firewalld/pepper.sls
+++ b/pillars/roles/firewalld/pepper.sls
--- a/pillars/roles/firewalld/plexmediaserver.sls
+++ b/pillars/roles/firewalld/plexmediaserver.sls
--- a/pillars/roles/firewalld/portal.sls
+++ b/pillars/roles/firewalld/portal.sls
--- a/pillars/roles/firewalld/saltmaster.sls
+++ b/pillars/roles/firewalld/saltmaster.sls
--- a/pillars/roles/firewalld/saltminion.sls
+++ b/pillars/roles/firewalld/saltminion.sls
--- a/pillars/roles/firewalld/server.sls
+++ b/pillars/roles/firewalld/server.sls
--- a/pillars/roles/firewalld/ssh.sls
+++ b/pillars/roles/firewalld/ssh.sls
--- a/pillars/roles/git/init.sls
+++ b/pillars/roles/git/init.sls
--- a/pillars/roles/git/none.sls
+++ b/pillars/roles/git/none.sls
--- a/pillars/roles/git/saltmaster.sls
+++ b/pillars/roles/git/saltmaster.sls
--- a/pillars/roles/init.sls
+++ b/pillars/roles/init.sls
--- a/pillars/roles/maintainer/deluge.sls
+++ b/pillars/roles/maintainer/deluge.sls
--- a/pillars/roles/maintainer/init.sls
+++ b/pillars/roles/maintainer/init.sls
--- a/pillars/roles/maintainer/pepper.sls
+++ b/pillars/roles/maintainer/pepper.sls
--- a/pillars/roles/maintainer/saltmaster.sls
+++ b/pillars/roles/maintainer/saltmaster.sls
--- a/pillars/roles/maintainer/saltminion.sls
+++ b/pillars/roles/maintainer/saltminion.sls
--- a/pillars/roles/maintainer/server.sls
+++ b/pillars/roles/maintainer/server.sls
--- a/pillars/roles/maintainer/ssh.sls
+++ b/pillars/roles/maintainer/ssh.sls
--- a/pillars/roles/mount/gitlab.sls
+++ b/pillars/roles/mount/gitlab.sls
@ -1,6 +1,6 @@
 mount:
  sshfs:
-    /var/lib/gitlab:
+    /mnt/repos:
      host: host.actcur.com
-      directory: /mnt/butter/git
-      user: git
+      directory: /mnt/butter/repos
+      user: gitlab
--- a/pillars/roles/mount/init.sls
+++ b/pillars/roles/mount/init.sls
--- a/pillars/roles/mount/none.sls
+++ b/pillars/roles/mount/none.sls
--- a/pillars/roles/mount/pkg-cache.sls
+++ b/pillars/roles/mount/pkg-cache.sls
--- a/pillars/roles/mount/plexmediaserver.sls
+++ b/pillars/roles/mount/plexmediaserver.sls
--- a/pillars/roles/mount/saltmaster.sls
+++ b/pillars/roles/mount/saltmaster.sls
--- a/pillars/roles/nginx/authtypes.txt
+++ b/pillars/roles/nginx/authtypes.txt
--- a/pillars/roles/nginx/baikal.sls
+++ b/pillars/roles/nginx/baikal.sls
--- a/pillars/roles/nginx/calandar.sls
+++ b/pillars/roles/nginx/calandar.sls
--- a/pillars/roles/nginx/git.sls
+++ b/pillars/roles/nginx/git.sls
--- a/pillars/roles/nginx/gitlab.sls
+++ b/pillars/roles/nginx/gitlab.sls
@ -1,6 +1,6 @@
 nginx:
-  git:
+  git2:
    auth: none
    https:
-      port: 3000
+      port: 8000
      prot: http
--- a/pillars/roles/nginx/headphones.sls
+++ b/pillars/roles/nginx/headphones.sls
--- a/pillars/roles/nginx/init.sls
+++ b/pillars/roles/nginx/init.sls
--- a/pillars/roles/nginx/jackett.sls
+++ b/pillars/roles/nginx/jackett.sls
--- a/pillars/roles/nginx/lam.sls
+++ b/pillars/roles/nginx/lam.sls
--- a/pillars/roles/nginx/lamp.sls
+++ b/pillars/roles/nginx/lamp.sls
--- a/pillars/roles/nginx/ldapui.sls
+++ b/pillars/roles/nginx/ldapui.sls
--- a/pillars/roles/nginx/none.sls
+++ b/pillars/roles/nginx/none.sls
--- a/pillars/roles/nginx/ombi.sls
+++ b/pillars/roles/nginx/ombi.sls
--- a/pillars/roles/nginx/pkg-cache.sls
+++ b/pillars/roles/nginx/pkg-cache.sls
--- a/pillars/roles/nginx/plexmediaserver.sls
+++ b/pillars/roles/nginx/plexmediaserver.sls
--- a/pillars/roles/nginx/radarr.sls
+++ b/pillars/roles/nginx/radarr.sls
--- a/pillars/roles/nginx/sonarr.sls
+++ b/pillars/roles/nginx/sonarr.sls
--- a/pillars/roles/nginx/sync.sls
+++ b/pillars/roles/nginx/sync.sls
--- a/pillars/roles/nginx/ttrss.sls
+++ b/pillars/roles/nginx/ttrss.sls
--- a/pillars/servers/env/init.sls
+++ b/pillars/servers/env/init.sls
--- a/pillars/servers/env/server/.sls
+++ b/pillars/servers/env/server/.sls
--- a/pillars/servers/env/server/archbaikal.sls
+++ b/pillars/servers/env/server/archbaikal.sls
--- a/pillars/servers/env/server/archcal.sls
+++ b/pillars/servers/env/server/archcal.sls
--- a/pillars/servers/env/server/archcouch.sls
+++ b/pillars/servers/env/server/archcouch.sls
--- a/pillars/servers/env/server/archdeluge.sls
+++ b/pillars/servers/env/server/archdeluge.sls
--- a/pillars/servers/env/server/archgit.sls
+++ b/pillars/servers/env/server/archgit.sls
--- a/pillars/servers/env/server/archgitlab.sls
+++ b/pillars/servers/env/server/archgitlab.sls
@ -0,0 +1 @@
+env: prod
--- a/pillars/servers/env/server/archheadphones.sls
+++ b/pillars/servers/env/server/archheadphones.sls
--- a/pillars/servers/env/server/archjackett.sls
+++ b/pillars/servers/env/server/archjackett.sls
--- a/pillars/servers/env/server/archlam.sls
+++ b/pillars/servers/env/server/archlam.sls
--- a/pillars/servers/env/server/archldap.sls
+++ b/pillars/servers/env/server/archldap.sls
--- a/pillars/servers/env/server/archldaptest.sls
+++ b/pillars/servers/env/server/archldaptest.sls
--- a/pillars/servers/env/server/archldapui.sls
+++ b/pillars/servers/env/server/archldapui.sls
--- a/pillars/servers/env/server/archmail.sls
+++ b/pillars/servers/env/server/archmail.sls
--- a/pillars/servers/env/server/archombi.sls
+++ b/pillars/servers/env/server/archombi.sls
--- a/pillars/servers/env/server/archpkg.sls
+++ b/pillars/servers/env/server/archpkg.sls
--- a/pillars/servers/env/server/archplex.sls
+++ b/pillars/servers/env/server/archplex.sls
--- a/pillars/servers/env/server/archportal.sls
+++ b/pillars/servers/env/server/archportal.sls
--- a/pillars/servers/env/server/archradarr.sls
+++ b/pillars/servers/env/server/archradarr.sls
--- a/pillars/servers/env/server/archrequest.sls
+++ b/pillars/servers/env/server/archrequest.sls
--- a/pillars/servers/env/server/archsalt.sls
+++ b/pillars/servers/env/server/archsalt.sls
--- a/pillars/servers/env/server/archsonarr.sls
+++ b/pillars/servers/env/server/archsonarr.sls
--- a/pillars/servers/env/server/archssh.sls
+++ b/pillars/servers/env/server/archssh.sls
--- a/pillars/servers/env/server/archsync.sls
+++ b/pillars/servers/env/server/archsync.sls
--- a/pillars/servers/env/server/archtt.sls
+++ b/pillars/servers/env/server/archtt.sls
--- a/pillars/servers/env/server/base
+++ b/pillars/servers/env/server/base
--- a/pillars/servers/env/server/centlamp.sls
+++ b/pillars/servers/env/server/centlamp.sls
--- a/pillars/servers/env/server/pisalt.sls
+++ b/pillars/servers/env/server/pisalt.sls
--- a/pillars/servers/init.sls
+++ b/pillars/servers/init.sls
--- a/pillars/servers/maintainer/init.sls
+++ b/pillars/servers/maintainer/init.sls
--- a/pillars/servers/maintainer/server/.sls
+++ b/pillars/servers/maintainer/server/.sls
--- a/pillars/servers/maintainer/server/archbaikal.sls
+++ b/pillars/servers/maintainer/server/archbaikal.sls
--- a/pillars/servers/maintainer/server/archcal.sls
+++ b/pillars/servers/maintainer/server/archcal.sls
--- a/pillars/servers/maintainer/server/archcouch.sls
+++ b/pillars/servers/maintainer/server/archcouch.sls
--- a/pillars/servers/maintainer/server/archdeluge.sls
+++ b/pillars/servers/maintainer/server/archdeluge.sls
--- a/pillars/servers/maintainer/server/archgit.sls
+++ b/pillars/servers/maintainer/server/archgit.sls
--- a/Show more
+++ b/Show more