From 6b659b35c1d6214688920200efe1d782a0a5d877 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Sun, 6 Oct 2019 04:52:01 +0200 Subject: Migrate more services (gogs, davmail), fix storage-related issues in web namespace --- setup/projects/services/templates/gogs.yml.j2 | 31 +++++++++++++++++++++++++++ setup/projects/services/vars/apps.yml | 3 +++ setup/projects/services/vars/davmail.yml | 14 ++++++++++++ setup/projects/services/vars/gogs.yml | 18 ++++++++++++++++ setup/projects/services/vars/script.yml | 6 ++++++ setup/projects/services/vars/volumes.yml | 8 +++++++ 6 files changed, 80 insertions(+) create mode 100644 setup/projects/services/templates/gogs.yml.j2 create mode 100644 setup/projects/services/vars/apps.yml create mode 100644 setup/projects/services/vars/davmail.yml create mode 100644 setup/projects/services/vars/gogs.yml create mode 100644 setup/projects/services/vars/script.yml create mode 100644 setup/projects/services/vars/volumes.yml (limited to 'setup/projects/services') diff --git a/setup/projects/services/templates/gogs.yml.j2 b/setup/projects/services/templates/gogs.yml.j2 new file mode 100644 index 0000000..57a5e65 --- /dev/null +++ b/setup/projects/services/templates/gogs.yml.j2 @@ -0,0 +1,31 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: gogs +data: + app.ini: | + APP_NAME = IPE Git + RUN_MODE = prod + RUN_USER = gogs + + [server] + DOMAIN = gogs.kaas.kit.edu + ROOT_URL = http://gogs.kaas.kit.edu + HTTP_PORT = 3000 + + [database] + DB_TYPE = sqlite3 + NAME = gogs + PATH = /data/gogs/gogs.db + + [repository] + ROOT = /data/repositories + + [security] + INSTALL_LOCK = true + + [service] + ENABLE_CAPTCHA = false + + [webhook] + SKIP_TLS_VERIFY = true diff --git a/setup/projects/services/vars/apps.yml b/setup/projects/services/vars/apps.yml new file mode 100644 index 0000000..3532941 --- /dev/null +++ b/setup/projects/services/vars/apps.yml @@ -0,0 +1,3 @@ +apps: + davmail: { provision: true, instantiate: true } + gogs: { provision: true, instantiate: true } diff --git a/setup/projects/services/vars/davmail.yml b/setup/projects/services/vars/davmail.yml new file mode 100644 index 0000000..956f6e5 --- /dev/null +++ b/setup/projects/services/vars/davmail.yml @@ -0,0 +1,14 @@ +davmail: + builders: + davmail: { src: "{{ ands_repos.docker }}/davmail.git" } + + pods: + davmail: + service: { ports: [ 1389, 1025, 1143, 1110, 1080 ] } + sched: { replicas: 1 } + images: + - stream: "davmail:latest" + probes: + - { port: 1389 } + env: + - { name: "DAVMAIL_URL", value: "https://owa.kit.edu/owa/" } diff --git a/setup/projects/services/vars/gogs.yml b/setup/projects/services/vars/gogs.yml new file mode 100644 index 0000000..b135746 --- /dev/null +++ b/setup/projects/services/vars/gogs.yml @@ -0,0 +1,18 @@ +gogs: + builders: + gogs: { src: "{{ ands_repos.docker }}/gogs.git" } + + pods: + gogs: + service: { host: "gogs.{{ openshift_master_default_subdomain }}", ports: [ 80/3000 ] } + groups: [ "services_gogs" ] + sched: { replicas: 1 } + images: + - stream: "gogs:latest" + configs: + - { name: "gogs", mount: "/data/gogs/conf" } + mappings: + - { name: "data", path: "gogs", mount: "/data" } +# - { name: "tmp", path: "gogs", mount: "/data/gogs/log" } + probes: + - { port: 3000 } diff --git a/setup/projects/services/vars/script.yml b/setup/projects/services/vars/script.yml new file mode 100644 index 0000000..f5d9378 --- /dev/null +++ b/setup/projects/services/vars/script.yml @@ -0,0 +1,6 @@ +oc: + - storage: ".*" + - templates: "gogs*" + - apps: ".*" + - oc: "expose svc/davmail --type LoadBalancer --protocol TCP --generator service/v1 --name davmail-ingress" + resource: "svc/davmail-ingress" diff --git a/setup/projects/services/vars/volumes.yml b/setup/projects/services/vars/volumes.yml new file mode 100644 index 0000000..192f572 --- /dev/null +++ b/setup/projects/services/vars/volumes.yml @@ -0,0 +1,8 @@ +gids: + services: { id: 9000 } + services_gogs: { id: 9001, users: [ 'csa', 'kopmann' ] } + +files: + - { osv: "data", path: "gogs", state: "directory", group: "services_gogs", mode: "02770" } + - { osv: "data/gogs", path: "gogs", state: "directory", group: "services_gogs", mode: "02770" } + -- cgit v1.2.3