summaryrefslogtreecommitdiffstats
path: root/setup/projects/kaas
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-03-01 21:15:50 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-03-01 21:15:50 +0100
commit69adb23c59e991ddcabf5cfce415fd8b638dbc1a (patch)
tree8693e708f751923f6f7f9dd48004303bebb4e126 /setup/projects/kaas
parent1f3e2a9f59e83dc3f0fcbecf096a7e7b40d36ed7 (diff)
downloadands-69adb23c59e991ddcabf5cfce415fd8b638dbc1a.tar.gz
ands-69adb23c59e991ddcabf5cfce415fd8b638dbc1a.tar.bz2
ands-69adb23c59e991ddcabf5cfce415fd8b638dbc1a.tar.xz
ands-69adb23c59e991ddcabf5cfce415fd8b638dbc1a.zip
Improve handling of filesystem permissions and other fixes
Diffstat (limited to 'setup/projects/kaas')
-rw-r--r--setup/projects/kaas/templates/40-kaas-manager.yml.j23
-rw-r--r--setup/projects/kaas/vars/volumes.yml11
2 files changed, 9 insertions, 5 deletions
diff --git a/setup/projects/kaas/templates/40-kaas-manager.yml.j2 b/setup/projects/kaas/templates/40-kaas-manager.yml.j2
index e181737..b9cba4e 100644
--- a/setup/projects/kaas/templates/40-kaas-manager.yml.j2
+++ b/setup/projects/kaas/templates/40-kaas-manager.yml.j2
@@ -43,6 +43,9 @@ objects:
{% for ofs in range(gid_range[1] | default(1) | int) %}
- {{ (gid_range[0] | int) + ofs }}
{% endfor %}
+{% if (ands_openshift_gid_mode | default('')) == "RunAsAny" %}
+ fsGroup: {{ gid_range[0] }}
+{% endif %}
{% if (kaas_project_config.run_pods_as is defined) %}
{% if ((kaas_project_config.uids | default(kaas_openshift_uids))[kaas_project_config.run_pods_as] is defined) %}
runAsUser: {{ (kaas_project_config.uids | default(kaas_openshift_uids))[kaas_project_config.run_pods_as].id }}
diff --git a/setup/projects/kaas/vars/volumes.yml b/setup/projects/kaas/vars/volumes.yml
index 3554aa6..cf9c697 100644
--- a/setup/projects/kaas/vars/volumes.yml
+++ b/setup/projects/kaas/vars/volumes.yml
@@ -1,10 +1,11 @@
-gids:
- kaas: { id: 4000 }
+#defined globaly
+#gids:
+# kaas: { id: 4000 }
files:
- - { osv: "data", path: "/www", state: "directory", group: "kaas", mode: "0775" }
- - { osv: "etc", path: "/apache2", state: "directory", group: "kaas", mode: "0775" }
- - { osv: "tmp", path: "/apache2", state: "directory", group: "kaas", mode: "0775" }
+ - { osv: "data", path: "/www", state: "directory", group: "kaas", mode: "02775" }
+ - { osv: "etc", path: "/apache2", state: "directory", group: "kaas", mode: "02775" }
+ - { osv: "tmp", path: "/apache2", state: "directory", group: "kaas", mode: "02775" }
#resync: true
sync_set_gid: kaas