Added freeipa-server state, added freeipa client configurations, renamed all servers and added bashrc

2017-10-07 17:10:16 -05:00 · 2017-10-07 17:10:16 -05:00 · d1927d0ace
commit d1927d0ace
parent 6d370e3104
128 changed files with 565 additions and 127 deletions
--- a/merge.sh
+++ b/merge.sh
@ -16,4 +16,4 @@ git push;
 git checkout dev;
 git reset --hard master;
 git push --force;
-git reset --hard origin/dev
+git reset --hard origin/dev;
--- a/pillars/roles/firewalld/freeipa-server.sls
+++ b/pillars/roles/firewalld/freeipa-server.sls
@ -0,0 +1,13 @@
+firewalld:
+  70_internal:
+    service:
+      http: []
+      https: []
+    port:
+      389/tcp: []
+      636/tcp: []
+      88/tcp: []
+      464/tcp: []
+      88/udp: []
+      464/udp: []
+      123/udp: []
--- a/pillars/roles/mount/sync.sls
+++ b/pillars/roles/mount/sync.sls
@ -0,0 +1,7 @@
+mount:
+  sshfs:
+    /mnt/sync:
+      name: sync
+      host: host.actcur.com
+      directory: /mnt/butter/sync
+      user: mount
--- a/pillars/roles/nginx/freeipa_server.sls
+++ b/pillars/roles/nginx/freeipa_server.sls
@ -0,0 +1,6 @@
+nginx:
+  ipa:
+    auth: blocked
+    https:
+      port: 8443
+      prot: https
--- a/pillars/servers/env/server/archportal.sls
+++ b/pillars/servers/env/server/archportal.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archradarr.sls
+++ b/pillars/servers/env/server/archradarr.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archsalt.sls
+++ b/pillars/servers/env/server/archsalt.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archsonarr.sls
+++ b/pillars/servers/env/server/archsonarr.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archsql.sls
+++ b/pillars/servers/env/server/archsql.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archssh.sls
+++ b/pillars/servers/env/server/archssh.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archsync.sls
+++ b/pillars/servers/env/server/archsync.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archtest.sls
+++ b/pillars/servers/env/server/archtest.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archtt.sls
+++ b/pillars/servers/env/server/archtt.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archvpn.sls
+++ b/pillars/servers/env/server/archvpn.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archbaikal.sls
+++ b/pillars/servers/env/server/archbaikal.sls
--- a/pillars/servers/env/server/archca.sls
+++ b/pillars/servers/env/server/archca.sls
--- a/pillars/servers/env/server/debiangitlab.sls
+++ b/pillars/servers/env/server/debiangitlab.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/debiangitlab.sls~HEAD
+++ b/pillars/servers/env/server/debiangitlab.sls~HEAD
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/debiangitlab.sls~HEAD_0
+++ b/pillars/servers/env/server/debiangitlab.sls~HEAD_0
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/debiangitlab.sls~history
+++ b/pillars/servers/env/server/debiangitlab.sls~history
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/debiangitlab.sls~history_0
+++ b/pillars/servers/env/server/debiangitlab.sls~history_0
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/debiantest.sls
+++ b/pillars/servers/env/server/debiantest.sls
@ -1 +0,0 @@
-env: prod
--- 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
--- a/pillars/servers/env/server/archgitlab.sls~HEAD
+++ b/pillars/servers/env/server/archgitlab.sls~HEAD
--- a/pillars/servers/env/server/archgitlab.sls~HEAD_0
+++ b/pillars/servers/env/server/archgitlab.sls~HEAD_0
--- a/pillars/servers/env/server/archgitlab.sls~history
+++ b/pillars/servers/env/server/archgitlab.sls~history
--- a/pillars/servers/env/server/archgitlab.sls~history_0
+++ b/pillars/servers/env/server/archgitlab.sls~history_0
--- a/pillars/servers/env/server/archheadphones.sls
+++ b/pillars/servers/env/server/archheadphones.sls
--- a/pillars/servers/env/server/archhost1.sls
+++ b/pillars/servers/env/server/archhost1.sls
--- a/pillars/servers/env/server/archhost1.sls~HEAD
+++ b/pillars/servers/env/server/archhost1.sls~HEAD
--- a/pillars/servers/env/server/archhost1.sls~HEAD_0
+++ b/pillars/servers/env/server/archhost1.sls~HEAD_0
--- a/pillars/servers/env/server/archhost1.sls~history
+++ b/pillars/servers/env/server/archhost1.sls~history
--- a/pillars/servers/env/server/archhost1.sls~history_0
+++ b/pillars/servers/env/server/archhost1.sls~history_0
--- a/pillars/servers/env/server/archicinga.sls
+++ b/pillars/servers/env/server/archicinga.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/archombi.sls
+++ b/pillars/servers/env/server/archombi.sls
--- a/pillars/servers/env/server/archpass.sls
+++ b/pillars/servers/env/server/archpass.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/maintainer/server/archportal.sls
+++ b/pillars/servers/maintainer/server/archportal.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archradarr.sls
+++ b/pillars/servers/maintainer/server/archradarr.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archsalt.sls
+++ b/pillars/servers/maintainer/server/archsalt.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archsonarr.sls
+++ b/pillars/servers/maintainer/server/archsonarr.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archsql.sls
+++ b/pillars/servers/maintainer/server/archsql.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archssh.sls
+++ b/pillars/servers/maintainer/server/archssh.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archsync.sls
+++ b/pillars/servers/maintainer/server/archsync.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archtest.sls
+++ b/pillars/servers/maintainer/server/archtest.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archtt.sls
+++ b/pillars/servers/maintainer/server/archtt.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archvpn.sls
+++ b/pillars/servers/maintainer/server/archvpn.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archbaikal.sls
+++ b/pillars/servers/maintainer/server/archbaikal.sls
--- a/pillars/servers/maintainer/server/archca.sls
+++ b/pillars/servers/maintainer/server/archca.sls
--- a/pillars/servers/maintainer/server/debiangitlab.sls
+++ b/pillars/servers/maintainer/server/debiangitlab.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/debiangitlab.sls~HEAD
+++ b/pillars/servers/maintainer/server/debiangitlab.sls~HEAD
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/debiangitlab.sls~HEAD_0
+++ b/pillars/servers/maintainer/server/debiangitlab.sls~HEAD_0
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/debiangitlab.sls~history
+++ b/pillars/servers/maintainer/server/debiangitlab.sls~history
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/debiangitlab.sls~history_0
+++ b/pillars/servers/maintainer/server/debiangitlab.sls~history_0
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/debiantest.sls
+++ b/pillars/servers/maintainer/server/debiantest.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- 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/pillars/servers/maintainer/server/archgitlab.sls
+++ b/pillars/servers/maintainer/server/archgitlab.sls
--- a/pillars/servers/maintainer/server/archgitlab.sls~HEAD
+++ b/pillars/servers/maintainer/server/archgitlab.sls~HEAD
--- a/pillars/servers/maintainer/server/archgitlab.sls~HEAD_0
+++ b/pillars/servers/maintainer/server/archgitlab.sls~HEAD_0
--- a/pillars/servers/maintainer/server/archgitlab.sls~history
+++ b/pillars/servers/maintainer/server/archgitlab.sls~history
--- a/pillars/servers/maintainer/server/archgitlab.sls~history_0
+++ b/pillars/servers/maintainer/server/archgitlab.sls~history_0
--- a/pillars/servers/maintainer/server/archheadphones.sls
+++ b/pillars/servers/maintainer/server/archheadphones.sls
--- a/pillars/servers/maintainer/server/archhost1.sls
+++ b/pillars/servers/maintainer/server/archhost1.sls
--- a/pillars/servers/maintainer/server/archhost1.sls~HEAD
+++ b/pillars/servers/maintainer/server/archhost1.sls~HEAD
--- a/pillars/servers/maintainer/server/archhost1.sls~HEAD_0
+++ b/pillars/servers/maintainer/server/archhost1.sls~HEAD_0
--- a/pillars/servers/maintainer/server/archhost1.sls~history
+++ b/pillars/servers/maintainer/server/archhost1.sls~history
--- a/pillars/servers/maintainer/server/archhost1.sls~history_0
+++ b/pillars/servers/maintainer/server/archhost1.sls~history_0
--- a/pillars/servers/maintainer/server/archicinga.sls
+++ b/pillars/servers/maintainer/server/archicinga.sls
--- a/pillars/servers/maintainer/server/archjackett.sls
+++ b/pillars/servers/maintainer/server/archjackett.sls
--- a/pillars/servers/maintainer/server/archlam.sls
+++ b/pillars/servers/maintainer/server/archlam.sls
--- a/pillars/servers/maintainer/server/archombi.sls
+++ b/pillars/servers/maintainer/server/archombi.sls
--- a/pillars/servers/maintainer/server/archpass.sls
+++ b/pillars/servers/maintainer/server/archpass.sls
--- a/pillars/servers/maintainer/server/archpkg.sls
+++ b/pillars/servers/maintainer/server/archpkg.sls
--- a/pillars/servers/maintainer/server/archplex.sls
+++ b/pillars/servers/maintainer/server/archplex.sls
--- a/pillars/servers/roles/server/archgitlab.sls
+++ b/pillars/servers/roles/server/archgitlab.sls
@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - gitlab
-    - nginx-proxy
--- a/pillars/servers/roles/server/archheadphones.sls
+++ b/pillars/servers/roles/server/archheadphones.sls
@ -1,8 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - headphones
-    - nfs
--- a/pillars/servers/roles/server/archlam.sls
+++ b/pillars/servers/roles/server/archlam.sls
@ -1,8 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - lam
-    - nginx-proxy
-
--- a/pillars/servers/roles/server/archtest.sls
+++ b/pillars/servers/roles/server/archtest.sls
@ -3,4 +3,3 @@ grains:
    - server
    - ssh
    - saltminion
-    - mysql
--- a/pillars/servers/roles/server/archbaikal.sls
+++ b/pillars/servers/roles/server/archbaikal.sls
--- a/pillars/servers/roles/server/archca.sls
+++ b/pillars/servers/roles/server/archca.sls
--- a/pillars/servers/roles/server/archdeluge.sls
+++ b/pillars/servers/roles/server/archdeluge.sls
--- a/pillars/servers/roles/server/archgit.sls
+++ b/pillars/servers/roles/server/archgit.sls
--- a/pillars/servers/roles/server/archhost1.sls
+++ b/pillars/servers/roles/server/archhost1.sls
--- a/pillars/servers/roles/server/archicinga.sls
+++ b/pillars/servers/roles/server/archicinga.sls
--- a/pillars/servers/roles/server/debiantest.sls
+++ b/pillars/servers/roles/server/debiantest.sls
@ -3,3 +3,4 @@ grains:
    - server
    - ssh
    - saltminion
+    - freeipa-server
--- a/pillars/servers/roles/server/debiangitlab.sls
+++ b/pillars/servers/roles/server/debiangitlab.sls
--- a/pillars/servers/roles/server/archjackett.sls
+++ b/pillars/servers/roles/server/archjackett.sls
--- a/pillars/servers/roles/server/archombi.sls
+++ b/pillars/servers/roles/server/archombi.sls
--- a/pillars/servers/roles/server/archpass.sls
+++ b/pillars/servers/roles/server/archpass.sls
--- a/pillars/servers/roles/server/archpkg.sls
+++ b/pillars/servers/roles/server/archpkg.sls
--- a/pillars/servers/roles/server/archplex.sls
+++ b/pillars/servers/roles/server/archplex.sls
--- a/pillars/servers/roles/server/archportal.sls
+++ b/pillars/servers/roles/server/archportal.sls
--- a/pillars/servers/roles/server/archradarr.sls
+++ b/pillars/servers/roles/server/archradarr.sls
--- a/pillars/servers/roles/server/archsalt.sls
+++ b/pillars/servers/roles/server/archsalt.sls
--- a/Show more
+++ b/Show more