Removed old services from config

4 files changed, 8 insertions, 74 deletions

diff --git a/compose/nginx/nginx.conf b/compose/nginx/nginx.conf
index 452e608..8bf1733 100644
--- a/compose/nginx/nginx.conf
+++ b/compose/nginx/nginx.conf
@@ -1,5 +1,5 @@
 user  nginx;
-worker_processes  1;
+worker_processes  4;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
diff --git a/docker.yml b/docker.yml
index 425e7d1..72878db 100644
--- a/docker.yml
+++ b/docker.yml
@@ -120,65 +120,6 @@
               - gitea
             volumes:
               - db/:/var/lib/postgresql/data
-  - name: grafana
-    docker_compose:
-      project_name: monitoring
-      pull: yes
-      state: absent
-      definition:
-        version: '3'
-        volumes:
-          grafana-storage:
-            external:
-              name: grafana_storage
-        services:
-          grafana:
-            image: grafana/grafana
-            ports:
-            - "127.0.0.1:{{domains.grafana.proxy.port}}:3000"
-            environment:
-            - "GF_SERVER_ROOT_URL=http://{{domains.grafana.name}}"
-            - "GF_SECURITY_ADMIN_PASSWORD={{grafana_admin_password}}"
-            volumes:
-            - "grafana-storage:/var/lib/grafana"
-          prometheus:
-            image: prom/prometheus
-            extra_hosts:
-            - "dockerhost:172.17.0.1"
-            volumes:
-              - "{{docker_compose_dir}}/monitoring/prometheus:/etc/prometheus/:ro"
-          cadvisor:
-            image: google/cadvisor
-            #expose: [8080]
-            volumes:
-              - "/:/rootfs:ro"
-              - "/var/run:/var/run:ro"
-              - "/sys:/sys:ro"
-              - "/var/lib/docker:/var/lib/docker:ro"
-              - "/dev/disk:/dev/disk:ro"
-  - name: registry
-    docker_compose:
-      project_name: registry
-      pull: yes
-      state: absent
-      definition:
-        version: '3'
-        volumes:
-          registry:
-            external:
-              name: registry
-        services:
-          registry:
-            ports:
-              - "127.0.0.1:{{domains.registry.proxy.port}}:5000"
-            image: registry:2
-            volumes:
-              - "registry:/var/lib/registry"
-            environment:
-              REGISTRY_STORAGE_MAINTENANCE: |-
-                readonly:
-                  enabled: true
-
   - name: vpn
     docker_compose:
       project_name: vpn
diff --git a/domains.yml b/domains.yml
index 2cdb377..6385712 100644
--- a/domains.yml
+++ b/domains.yml
@@ -4,25 +4,16 @@ domains:
     name: ".dybiec.info"
     http_redirect: true
     dir: "/usr/share/nginx/html"
-  registry:
-    name: "registry.dybiec.info"
-    disabled: true
-    proxy:
-      port: 5000
   git:
     name: "git.dybiec.info"
     http_redirect: true
     proxy:
       port: 5001
       cache: true
-  grafana:
-    name: "grafana.dybiec.info"
-    disabled: true
-    http_redirect: true
-    proxy:
-      port: 5002
+      keepalive: true
   cnt:
     name: "cnt.dybiec.info"
+    websocket: true
     proxy:
       port: 5003
   octoprint:
@@ -33,7 +24,8 @@ domains:
     proxy:
       host: "10.10.1.4"
       keepalive: true
-      timeout: 10s
+      timeout: 4s
+      cache: true
   octoprint2:
     name: "octoprint2.dybiec.info"
     http_redirect: true
@@ -42,4 +34,5 @@ domains:
     proxy:
       host: "10.10.1.5"
       keepalive: true
-      timeout: 10s
+      timeout: 4s
+      cache: true
diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
index 9261fa0..60987fa 100644
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@@ -7,7 +7,7 @@ server {
 {% endif %}
 
 {% if server.proxy is defined and server.proxy.cache is defined and server.proxy.cache %}
-  proxy_cache_path /usr/share/nginx/cache levels=1:2 keys_zone=cache_{{ short_name }}:10m max_size=100m inactive=60m use_temp_path=off; 
+  proxy_cache_path /usr/share/nginx/cache_{{ short_name }} levels=1:2 keys_zone=cache_{{ short_name }}:10m max_size=100m inactive=60m use_temp_path=off; 
 {% endif %}
 server {