Trac hosting (old and new); WebDAV service for KATRIN

6 files changed, 90 insertions, 44 deletions

diff --git a/setup/projects/kaas/templates/10-kaas-builder.yml.j2 b/setup/projects/kaas/templates/10-kaas-builder.yml.j2
deleted file mode 100644
index 52066a5..0000000
--- a/setup/projects/kaas/templates/10-kaas-builder.yml.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: v1
-kind: Template
-metadata:
-  name: kaas-manager-build
-  labels:
-    app: kaas-manager
-  annotations:
-    descriptions: "KaaS Data Manager Build"
-objects:
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kaas-manager
-  - kind: "BuildConfig"
-    apiVersion: "v1"
-    metadata:
-      name: "kaas-manager"
-    spec:
-#      runPolicy: "Serial"
-      successfulBuildsHistoryLimit: "{{ kaas_pod_history_limit }}"
-      failedBuildsHistoryLimit: "{{ kaas_pod_history_limit }}"
-      triggers: 
-        - type: "ConfigChange"
-      source: 
-        type: "Git"
-        git:
-          uri: "http://adei.info/git/csa/devops/docker/ands-management.git"
-      strategy: 
-        dockerStrategy:
-          dockerfilePath: Dockerfile
-      output: 
-        to:
-          kind: "ImageStreamTag"
-          name: "kaas-manager:latest"
-        imageLabels:
-        - name: "vendor"
-          value: "KIT"
-        - name: "author"
-          value: "Suren A. Chilingaryan"
-        - name: "authoritative-source-url"
-          value: "adei.info"
-      
diff --git a/setup/projects/kaas/vars/pods.yml b/setup/projects/kaas/vars/pods.yml
index 8cfa65a..fe406f4 100644
--- a/setup/projects/kaas/vars/pods.yml
+++ b/setup/projects/kaas/vars/pods.yml
@@ -1,3 +1,8 @@
+builders:
+  kaas-manager: { src: "{{ ands_repos.docker }}/management.git" }
+  kaas-webdav:  { src: "{{ ands_repos.docker }}/apache.git", src_path: "2.4", args: { ENABLE_DAV: 1 } }
+  kaas-apache:  { src: "{{ ands_repos.docker }}/apache.git", src_path: "2.4", args: { ENABLE_PHP: 1 } }
+
 pods:
   kaas-router:
       service: { host: "{{ katrin_node }}", ports: [ 80/8080, 443/8043 ] }
@@ -10,5 +15,3 @@ pods:
             - { name: "tmp",  path: "apache2", mount: "/usr/local/apache2/logs" }
           probes:
             - { port: 8080, path: '/index.html' }
-
-  
\ No newline at end of file
diff --git a/setup/projects/katrin/templates/20-upload-secret.yml.j2 b/setup/projects/katrin/templates/20-upload-secret.yml.j2
new file mode 100644
index 0000000..343adc2
--- /dev/null
+++ b/setup/projects/katrin/templates/20-upload-secret.yml.j2
@@ -0,0 +1,17 @@
+#jinja2: trim_blocks: "true", lstrip_blocks: "false"
+---
+apiVersion: v1
+kind: Template
+metadata:
+  name: katrin-upload
+  annotations:
+    descriptions: KaaS Data Management Service
+objects:
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: katrin-upload
+    type: openshift.io/cifs
+    stringData:
+      username: "katrin"
+      password: "katrin"
diff --git a/setup/projects/katrin/vars/pods.yml b/setup/projects/katrin/vars/pods.yml
new file mode 100644
index 0000000..0c74816
--- /dev/null
+++ b/setup/projects/katrin/vars/pods.yml
@@ -0,0 +1,15 @@
+pods:
+  katrin-webdav:
+      service: { host: "katrin-webdav.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
+      sched: { replicas: 1 }
+      images:
+        - stream: "kaas/kaas-webdav:latest"
+          mappings: 
+            - { name: "katrin",  path: "upload", mount: "/var/dav/data" }
+          env:
+            - { name: "USERNAME", value: "secret@katrin-upload/username" }
+            - { name: "PASSWORD", value: "secret@katrin-upload/password" }
+          probes:
+            - { port: 8080 }
+
+  
\ No newline at end of file
diff --git a/setup/projects/web/vars/pods.yml b/setup/projects/web/vars/pods.yml
new file mode 100644
index 0000000..a7797b8
--- /dev/null
+++ b/setup/projects/web/vars/pods.yml
@@ -0,0 +1,38 @@
+builders:
+  apache: { type: Source, image: "php:latest", src: "{{ ands_repos.docker }}/simplephp.git" }
+  trac0: { name: "trac", src: "{{ ands_repos.docker }}/trac.git", src_path: "0.10", version: "0.10" }
+  trac:  { name: "trac", src: "{{ ands_repos.docker }}/trac.git", src_path: "latest", version: "latest" }
+
+pods:
+  web-kopmann:
+      service: { host: "web-kopmann.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
+      sched: { replicas: 1 }
+      groups: [ "web_kopmann" ]
+      images:
+        - stream: "apache:latest"
+          mappings: 
+            - { name: "web_data", path: "kopmann",     mount: "/opt/app-root/src" }
+          probes:
+            - { port: 8080 }
+  trac-adei:
+      service: { host: "trac-adei.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
+      sched: { replicas: 1 }
+      groups: [ "web_trac", "web_auth" ]
+      images:
+        - stream: "trac:0.10"
+          mappings: 
+            - { name: "web_etc",  path: "auth",         mount: "/auth" }
+            - { name: "web_data", path: "trac/adei/",   mount: "/trac/adei" }
+          probes:
+            - { port: 8080 }
+  trac-pdv:
+      service: { host: "trac-pdv.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
+      sched: { replicas: 1 }
+      groups: [ "web_trac", "web_auth" ]
+      images:
+        - stream: "trac:latest"
+          mappings: 
+            - { name: "web_etc",  path: "auth",         mount: "/auth" }
+            - { name: "web_data", path: "trac/pdv",     mount: "/trac" }
+          probes:
+            - { port: 8080 }
diff --git a/setup/projects/web/vars/volumes.yml b/setup/projects/web/vars/volumes.yml
new file mode 100644
index 0000000..579e041
--- /dev/null
+++ b/setup/projects/web/vars/volumes.yml
@@ -0,0 +1,15 @@
+gids:
+  web: { id: 6201, users: [ 'csa', 'kopmann' ]  }
+  web_kopmann: { id: 6202, users: [ 'kopmann' ]  }
+  web_trac: { id: 6205, users: [ 'csa', 'kopmann' ] }
+  web_auth: { id: 6209 }
+ 
+
+volumes:
+  web_etc: { volume: "openshift", path: "", write: false }
+  web_data: { volume: "datastore", path: "/web", write: true }
+
+files:
+  - { osv: "web_etc",   path: "auth",      state: "directory", group: "web_auth", mode: "02770" }
+  - { osv: "web_data",  path: "trac",      state: "directory", group: "web_trac",    mode: "02770" }
+  - { osv: "web_data",  path: "kopmann",   state: "directory", group: "web_kopmann", mode: "02770" }