fix matomo deployment

2 files changed, 110 insertions, 1 deletions

diff --git a/contrib/k8s-emc/matomo-cm.yml b/contrib/k8s-emc/matomo-cm.yml
new file mode 100644
index 0000000..f8ce063
--- /dev/null
+++ b/contrib/k8s-emc/matomo-cm.yml
@@ -0,0 +1,82 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: emc
+  name: stats-matomo
+  labels:
+    app: matomo
+    tier: stats
+data:
+  nginx.conf: |
+    worker_processes 4;
+    pid /srv/nginx.pid;
+    error_log /dev/stderr notice;
+
+    events {
+      worker_connections 768;
+      # multi_accept on;
+    }
+
+    http {
+      sendfile on;
+      tcp_nopush on;
+      tcp_nodelay on;
+      keepalive_timeout 65;
+      types_hash_max_size 2048;
+
+      server_names_hash_bucket_size 64;
+
+      include /etc/nginx/mime.types;
+      default_type application/octet-stream;
+
+      access_log /dev/null;
+
+      server {
+        listen 8080 default_server;
+        listen [::]:8080 default_server;
+
+        server_name _;
+
+        root /var/www/html;
+
+        index index.php index.html index.htm;
+
+        location / {
+          try_files $uri $uri/ =404;
+        }
+
+        error_page 404 /404.html;
+        error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+          root /usr/share/nginx/html;
+        }
+
+        location = /favicon.ico {
+          log_not_found off;
+          access_log off;
+        }
+
+        location ~ \.php$ {
+          fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+          fastcgi_param  SERVER_SOFTWARE    nginx;
+          fastcgi_param  QUERY_STRING       $query_string;
+          fastcgi_param  REQUEST_METHOD     $request_method;
+          fastcgi_param  CONTENT_TYPE       $content_type;
+          fastcgi_param  CONTENT_LENGTH     $content_length;
+          fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+          fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+          fastcgi_param  REQUEST_URI        $request_uri;
+          fastcgi_param  DOCUMENT_URI       $document_uri;
+          fastcgi_param  DOCUMENT_ROOT      $document_root;
+          fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+          fastcgi_param  REMOTE_ADDR        $remote_addr;
+          fastcgi_param  REMOTE_PORT        $remote_port;
+          fastcgi_param  SERVER_ADDR        $server_addr;
+          fastcgi_param  SERVER_PORT        $server_port;
+          fastcgi_param  SERVER_NAME        $server_name;
+          fastcgi_param  HTTP_X_FORWARDED_URI    /matomo;
+          fastcgi_intercept_errors on;
+          fastcgi_pass 127.0.0.1:9000;
+        }
+      }
+    }
diff --git a/contrib/k8s-emc/matomo-deploy.yml b/contrib/k8s-emc/matomo-deploy.yml
index 29cbd87..646323f 100644
--- a/contrib/k8s-emc/matomo-deploy.yml
+++ b/contrib/k8s-emc/matomo-deploy.yml
@@ -36,12 +36,39 @@ spec:
           mountPath: /srv/html
       containers:
       - name: matomo
-        image: spreadspace/matomo:2
+        image: spreadspace/matomo:3
         imagePullPolicy: Always
         volumeMounts:
         - name: matomo-html
           mountPath: /var/www/html
+      - name: nginx
+        image: spreadspace/nginx:4
+        imagePullPolicy: Always
+        args:
+        - nginx
+        - -c
+        - /srv/config/nginx.conf
+        - -g
+        - "daemon off;"
+        volumeMounts:
+        - name: home
+          mountPath: /srv
+        - name: nginx-lib
+          mountPath: /var/lib/nginx
+        - name: nginx-config
+          mountPath: /srv/config
+        - name: matomo-html
+          mountPath: /var/www/html
       volumes:
+      - name: home
+        emptyDir:
+          medium: Memory
+      - name: nginx-lib
+        emptyDir:
+          medium: Memory
+      - name: nginx-config
+        configMap:
+          name: stats-matomo
       - name: matomo-html
         hostPath:
           type: DirectoryOrCreate