cleaned up server files

2017-08-21 20:32:45 +00:00 · 2017-08-21 20:32:45 +00:00 · f5cca4d6c8
commit f5cca4d6c8
parent a95bb60386
37 changed files with 10 additions and 134 deletions
--- a/pillars/roles/firewalld/nginx-proxy.sls
+++ b/pillars/roles/firewalld/nginx-proxy.sls
@ -3,6 +3,3 @@ firewalld:
    service:
      - http
      - https
-  50_server:
-    port:
-      - 8080/tcp
--- a/pillars/roles/firewalld/pepper.sls
+++ b/pillars/roles/firewalld/pepper.sls
@ -1,4 +0,0 @@
-firewalld:
-  70_internal:
-    port:
-      - 80/tcp
--- a/pillars/roles/nginx/calandar.sls
+++ b/pillars/roles/nginx/calandar.sls
@ -1,11 +0,0 @@
-nginx:
-  cal:
-    auth: none
-    https:
-      port: 8081
-      prot: http
-  baikal:
-    auth: none
-    https:
-      port: 8081
-      prot: http
--- a/pillars/roles/nginx/ldapui.sls
+++ b/pillars/roles/nginx/ldapui.sls
@ -1,6 +0,0 @@
-nginx:
-  ldapui:
-    auth: simple
-    https:
-      port: 8000
-      prot: http
--- a/pillars/servers/env/server/.sls
+++ b/pillars/servers/env/server/.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archcal.sls
+++ b/pillars/servers/env/server/archcal.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archcouch.sls
+++ b/pillars/servers/env/server/archcouch.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archldap.sls
+++ b/pillars/servers/env/server/archldap.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archldaptest.sls
+++ b/pillars/servers/env/server/archldaptest.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archldapui.sls
+++ b/pillars/servers/env/server/archldapui.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archmail.sls
+++ b/pillars/servers/env/server/archmail.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/archrequest.sls
+++ b/pillars/servers/env/server/archrequest.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/centlamp.sls
+++ b/pillars/servers/env/server/centlamp.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/env/server/pisalt.sls
+++ b/pillars/servers/env/server/pisalt.sls
@ -1 +0,0 @@
-env: prod
--- a/pillars/servers/maintainer/server/.sls
+++ b/pillars/servers/maintainer/server/.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archcal.sls
+++ b/pillars/servers/maintainer/server/archcal.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archcouch.sls
+++ b/pillars/servers/maintainer/server/archcouch.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archldap.sls
+++ b/pillars/servers/maintainer/server/archldap.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archldaptest.sls
+++ b/pillars/servers/maintainer/server/archldaptest.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archldapui.sls
+++ b/pillars/servers/maintainer/server/archldapui.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archmail.sls
+++ b/pillars/servers/maintainer/server/archmail.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/archrequest.sls
+++ b/pillars/servers/maintainer/server/archrequest.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/centlamp.sls
+++ b/pillars/servers/maintainer/server/centlamp.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/maintainer/server/pisalt.sls
+++ b/pillars/servers/maintainer/server/pisalt.sls
@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
--- a/pillars/servers/roles/server/.sls
+++ b/pillars/servers/roles/server/.sls
@ -1,5 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
--- a/pillars/servers/roles/server/archcal.sls
+++ b/pillars/servers/roles/server/archcal.sls
@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - calandar
--- a/pillars/servers/roles/server/archcouch.sls
+++ b/pillars/servers/roles/server/archcouch.sls
@ -1,8 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - couch
-    - nfs
--- a/pillars/servers/roles/server/archldap.sls
+++ b/pillars/servers/roles/server/archldap.sls
@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - ldap
--- a/pillars/servers/roles/server/archldaptest.sls
+++ b/pillars/servers/roles/server/archldaptest.sls
@ -1,5 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
--- a/pillars/servers/roles/server/archldapui.sls
+++ b/pillars/servers/roles/server/archldapui.sls
@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - ldapui
-    - nginx-proxy
--- a/pillars/servers/roles/server/archmail.sls
+++ b/pillars/servers/roles/server/archmail.sls
@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - sendmail
--- a/pillars/servers/roles/server/archrequest.sls
+++ b/pillars/servers/roles/server/archrequest.sls
@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - plexrequests
-    - nginx-proxy
--- a/pillars/servers/roles/server/centlamp.sls
+++ b/pillars/servers/roles/server/centlamp.sls
@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - lamp
--- a/pillars/servers/roles/server/pisalt.sls
+++ b/pillars/servers/roles/server/pisalt.sls
@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - saltmaster
--- a/states/roles/maintain/gitlab/init.sls
+++ b/states/roles/maintain/gitlab/init.sls
@ -16,9 +16,9 @@ gitlab_nginx:
 /etc/webapps/gitlab/database.yml:
  file.managed:
    - source: salt://roles/maintain/gitlab/conf_files/database.yml
-    - user: root
-    - group: root
-    - mode: 644
+    - user: gitlab
+    - group: gitlab
+    - mode: 600
    - template: jinja
 /etc/webapps/gitlab/resque.yml:
  file.managed:
@ -29,9 +29,9 @@ gitlab_nginx:
 /etc/webapps/gitlab-shell/config.yml:
  file.managed:
    - source: salt://roles/maintain/gitlab/conf_files/config.yml
-    - user: root
-    - group: root
-    - mode: 644
+    - user: gitlab
+    - group: gitlab
+    - mode: 600
 /usr/share/webapps/gitlab/config/initializers/smtp_settings.rb:
  file.managed:
    - source: salt://roles/maintain/gitlab/conf_files/smtp_settings.rb
--- a/states/roles/maintain/nginx-proxy/local.conf
+++ b/states/roles/maintain/nginx-proxy/local.conf
@ -27,6 +27,9 @@ server {
    location / {
        proxy_pass $backend;
        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Protocol https;
+        proxy_set_header X-Forwarded-Ssl on;
+

        # re-write redirects to http as to https, example: /home
        proxy_redirect http:// https://;
--- a/1
+++ b/1
@ -0,0 +1 @@
+abcd