v0.0.5

tasks/git.yaml

@@ -1,6 +1,17 @@
 ---
 # tasks file for git
-- name: Create a config map for httpd
+- name: Create a config map for git gitweb
+  k8s:
+    state: present
+    api_version: v1
+    kind: ConfigMap
+    name: git-gitweb
+    namespace: "eom-{{ target_namespace }}"
+    definition:
+      data: 
+        gitweb.conf: "{{ lookup('file', 'gitweb.conf') }}"
+
+- name: Create a config map for git httpd
   vars:
     httpd_server_name: "git.eom.dev"
     httpd_conf_extra:
@@ -10,7 +21,7 @@
     state: present
     api_version: v1
     kind: ConfigMap
-    name: git
+    name: git-httpd
     namespace: "eom-{{ target_namespace }}"
     definition:
       data:
@@ -85,16 +96,22 @@
               - name: gitweb
                 image: ericomeehan/gitweb
                 volumeMounts:
-                  - name: config
+                  - name: gitweb-config
+                    mountPath: /etc/gitweb.conf
+                    subPath: gitweb.conf
+                  - name: httpd-config
                     mountPath: /usr/local/apache2/conf
                   - name: data
                     mountPath: /usr/local/apache2/htdocs
                 ports:
                   - containerPort: 80
             volumes:
-              - name: config
+              - name: gitweb-config
                 configMap:
-                  name: git
+                  name: git-gitweb
+              - name: httpd-config
+                configMap:
+                  name: git-httpd
               - name: data
                 persistentVolumeClaim:
                   claimName: git

tasks/www.yaml

@@ -38,8 +38,8 @@
               app: www
           spec:
             containers:
-              - name: httpd
-                image: httpd
+              - name: www
+                image: ericomeehan/www
                 volumeMounts:
                   - name: config
                     mountPath: /usr/local/apache2/conf