diff --git a/pillars/roles/firewalld/nginx-proxy.sls b/pillars/roles/firewalld/nginx-proxy.sls
index 3ff8c54..687ca3e 100644
--- 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
diff --git a/pillars/roles/firewalld/pepper.sls b/pillars/roles/firewalld/pepper.sls
deleted file mode 100644
index aada81c..0000000
--- a/pillars/roles/firewalld/pepper.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-firewalld:
-  70_internal:
-    port:
-      - 80/tcp
diff --git a/pillars/roles/nginx/calandar.sls b/pillars/roles/nginx/calandar.sls
deleted file mode 100644
index ce7455a..0000000
--- a/pillars/roles/nginx/calandar.sls
+++ /dev/null
@@ -1,11 +0,0 @@
-nginx:
-  cal:
-    auth: none
-    https:
-      port: 8081
-      prot: http
-  baikal:
-    auth: none
-    https:
-      port: 8081
-      prot: http
diff --git a/pillars/roles/nginx/ldapui.sls b/pillars/roles/nginx/ldapui.sls
deleted file mode 100644
index 4687ede..0000000
--- a/pillars/roles/nginx/ldapui.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-nginx:
-  ldapui:
-    auth: simple
-    https:
-      port: 8000
-      prot: http
diff --git a/pillars/servers/env/server/.sls b/pillars/servers/env/server/.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archcal.sls b/pillars/servers/env/server/archcal.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archcal.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archcouch.sls b/pillars/servers/env/server/archcouch.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archcouch.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archldap.sls b/pillars/servers/env/server/archldap.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archldap.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archldaptest.sls b/pillars/servers/env/server/archldaptest.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archldaptest.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archldapui.sls b/pillars/servers/env/server/archldapui.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archldapui.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archmail.sls b/pillars/servers/env/server/archmail.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archmail.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/archrequest.sls b/pillars/servers/env/server/archrequest.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archrequest.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/centlamp.sls b/pillars/servers/env/server/centlamp.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/centlamp.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/pisalt.sls b/pillars/servers/env/server/pisalt.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/pisalt.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/maintainer/server/.sls b/pillars/servers/maintainer/server/.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archcal.sls b/pillars/servers/maintainer/server/archcal.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archcal.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archcouch.sls b/pillars/servers/maintainer/server/archcouch.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archcouch.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archldap.sls b/pillars/servers/maintainer/server/archldap.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archldap.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archldaptest.sls b/pillars/servers/maintainer/server/archldaptest.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archldaptest.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archldapui.sls b/pillars/servers/maintainer/server/archldapui.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archldapui.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archmail.sls b/pillars/servers/maintainer/server/archmail.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archmail.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/archrequest.sls b/pillars/servers/maintainer/server/archrequest.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/archrequest.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/centlamp.sls b/pillars/servers/maintainer/server/centlamp.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/centlamp.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/maintainer/server/pisalt.sls b/pillars/servers/maintainer/server/pisalt.sls
deleted file mode 100644
index c0b416d..0000000
--- a/pillars/servers/maintainer/server/pisalt.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-maintainer:
-  - masaufuku
-
diff --git a/pillars/servers/roles/server/.sls b/pillars/servers/roles/server/.sls
deleted file mode 100644
index 07c13df..0000000
--- a/pillars/servers/roles/server/.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
diff --git a/pillars/servers/roles/server/archcal.sls b/pillars/servers/roles/server/archcal.sls
deleted file mode 100644
index 7432a1e..0000000
--- a/pillars/servers/roles/server/archcal.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - calandar
diff --git a/pillars/servers/roles/server/archcouch.sls b/pillars/servers/roles/server/archcouch.sls
deleted file mode 100644
index d26e731..0000000
--- a/pillars/servers/roles/server/archcouch.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - couch
-    - nfs
diff --git a/pillars/servers/roles/server/archldap.sls b/pillars/servers/roles/server/archldap.sls
deleted file mode 100644
index bc13938..0000000
--- a/pillars/servers/roles/server/archldap.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - ldap
diff --git a/pillars/servers/roles/server/archldaptest.sls b/pillars/servers/roles/server/archldaptest.sls
deleted file mode 100644
index 07c13df..0000000
--- a/pillars/servers/roles/server/archldaptest.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
diff --git a/pillars/servers/roles/server/archldapui.sls b/pillars/servers/roles/server/archldapui.sls
deleted file mode 100644
index c8f6570..0000000
--- a/pillars/servers/roles/server/archldapui.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - ldapui
-    - nginx-proxy
diff --git a/pillars/servers/roles/server/archmail.sls b/pillars/servers/roles/server/archmail.sls
deleted file mode 100644
index a6ca203..0000000
--- a/pillars/servers/roles/server/archmail.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - sendmail
diff --git a/pillars/servers/roles/server/archrequest.sls b/pillars/servers/roles/server/archrequest.sls
deleted file mode 100644
index ee25b86..0000000
--- a/pillars/servers/roles/server/archrequest.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - plexrequests
-    - nginx-proxy
diff --git a/pillars/servers/roles/server/centlamp.sls b/pillars/servers/roles/server/centlamp.sls
deleted file mode 100644
index 9c57b3d..0000000
--- a/pillars/servers/roles/server/centlamp.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - nginx-proxy
-    - lamp
diff --git a/pillars/servers/roles/server/pisalt.sls b/pillars/servers/roles/server/pisalt.sls
deleted file mode 100644
index e69d932..0000000
--- a/pillars/servers/roles/server/pisalt.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - saltminion
-    - saltmaster
diff --git a/states/roles/maintain/gitlab/init.sls b/states/roles/maintain/gitlab/init.sls
index 7725fb0..2351299 100644
--- 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
diff --git a/states/roles/maintain/nginx-proxy/local.conf b/states/roles/maintain/nginx-proxy/local.conf
index 06ea3c4..0fefb1c 100644
--- 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://;
diff --git a/test b/test
new file mode 100644
index 0000000..acbe86c
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+abcd