From 963221b9cab88846db37ad5efa658eeb39aada35 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Thu, 29 Aug 2019 05:07:11 +0200
Subject: Trac hosting (old and new); WebDAV service for KATRIN

---
 .../projects/kaas/templates/10-kaas-builder.yml.j2 | 42 ----------------------
 setup/projects/kaas/vars/pods.yml                  |  7 ++--
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 setup/projects/kaas/templates/10-kaas-builder.yml.j2

(limited to 'setup/projects/kaas')

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
-- 
cgit v1.2.3