actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

cleaned up server files

Browse source
This commit is contained in:
Beth Parker 2017-08-21 20:32:45 +00:00
parent a95bb60386
commit f5cca4d6c8
37 changed files with 10 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pillars/roles/firewalld/nginx-proxy.sls
View file

@ -3,6 +3,3 @@ firewalld:
service: service:
- http - http
- https - https
50_server:
port:
- 8080/tcp

4
pillars/roles/firewalld/pepper.sls
View file

@ -1,4 +0,0 @@
firewalld:
70_internal:
port:
- 80/tcp

11
pillars/roles/nginx/calandar.sls
View file

@ -1,11 +0,0 @@
nginx:
cal:
auth: none
https:
port: 8081
prot: http
baikal:
auth: none
https:
port: 8081
prot: http

6
pillars/roles/nginx/ldapui.sls
View file

@ -1,6 +0,0 @@
nginx:
ldapui:
auth: simple
https:
port: 8000
prot: http

1
pillars/servers/env/server/.sls vendored
View file

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

1
pillars/servers/env/server/archcal.sls vendored
View file

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

1
pillars/servers/env/server/archcouch.sls vendored
View file

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

1
pillars/servers/env/server/archldap.sls vendored
View file

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

1
pillars/servers/env/server/archldaptest.sls vendored
View file

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

1
pillars/servers/env/server/archldapui.sls vendored
View file

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

1
pillars/servers/env/server/archmail.sls vendored
View file

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

1
pillars/servers/env/server/archrequest.sls vendored
View file

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

1
pillars/servers/env/server/centlamp.sls vendored
View file

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

1
pillars/servers/env/server/pisalt.sls vendored
View file

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

3
pillars/servers/maintainer/server/.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archcal.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archcouch.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archldap.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archldaptest.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archldapui.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archmail.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/archrequest.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/centlamp.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

3
pillars/servers/maintainer/server/pisalt.sls
View file

@ -1,3 +0,0 @@
maintainer:
- masaufuku

5
pillars/servers/roles/server/.sls
View file

@ -1,5 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion

7
pillars/servers/roles/server/archcal.sls
View file

@ -1,7 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- nginx-proxy
- calandar

8
pillars/servers/roles/server/archcouch.sls
View file

@ -1,8 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- nginx-proxy
- couch
- nfs

6
pillars/servers/roles/server/archldap.sls
View file

@ -1,6 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- ldap

5
pillars/servers/roles/server/archldaptest.sls
View file

@ -1,5 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion

7
pillars/servers/roles/server/archldapui.sls
View file

@ -1,7 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- ldapui
- nginx-proxy

6
pillars/servers/roles/server/archmail.sls
View file

@ -1,6 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- sendmail

7
pillars/servers/roles/server/archrequest.sls
View file

@ -1,7 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- plexrequests
- nginx-proxy

7
pillars/servers/roles/server/centlamp.sls
View file

@ -1,7 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- nginx-proxy
- lamp

6
pillars/servers/roles/server/pisalt.sls
View file

@ -1,6 +0,0 @@
grains:
roles:
- server
- ssh
- saltminion
- saltmaster

12
states/roles/maintain/gitlab/init.sls
View file

@ -16,9 +16,9 @@ gitlab_nginx:
/etc/webapps/gitlab/database.yml: /etc/webapps/gitlab/database.yml:
file.managed: file.managed:
- source: salt://roles/maintain/gitlab/conf_files/database.yml - source: salt://roles/maintain/gitlab/conf_files/database.yml
- user: root - user: gitlab
- group: root - group: gitlab
- mode: 644 - mode: 600
- template: jinja - template: jinja
/etc/webapps/gitlab/resque.yml: /etc/webapps/gitlab/resque.yml:
file.managed: file.managed:
@ -29,9 +29,9 @@ gitlab_nginx:
/etc/webapps/gitlab-shell/config.yml: /etc/webapps/gitlab-shell/config.yml:
file.managed: file.managed:
- source: salt://roles/maintain/gitlab/conf_files/config.yml - source: salt://roles/maintain/gitlab/conf_files/config.yml
- user: root - user: gitlab
- group: root - group: gitlab
- mode: 644 - mode: 600
/usr/share/webapps/gitlab/config/initializers/smtp_settings.rb: /usr/share/webapps/gitlab/config/initializers/smtp_settings.rb:
file.managed: file.managed:
- source: salt://roles/maintain/gitlab/conf_files/smtp_settings.rb - source: salt://roles/maintain/gitlab/conf_files/smtp_settings.rb

3
states/roles/maintain/nginx-proxy/local.conf
View file

@ -27,6 +27,9 @@ server {
location / { location / {
proxy_pass $backend; proxy_pass $backend;
proxy_set_header Host $host; 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 # re-write redirects to http as to https, example: /home
proxy_redirect http:// https://; proxy_redirect http:// https://;

1
test Normal file
View file

@ -0,0 +1 @@
abcd