diff --git a/base/hostconfig/auto02.sls b/base/hostconfig/auto02.sls index e2b6148..109923b 100644 --- a/base/hostconfig/auto02.sls +++ b/base/hostconfig/auto02.sls @@ -6,12 +6,23 @@ pki: - auto-conf.chaos - pihole.chaos - nodered.chaos + - rompr.chaos os: release: bullseye systemd: service: + container-rompr: + Unit: + Description: Rompr + After: network-online.target local-fs.target + Before: haproxy.service + Service: + ExecStart: /usr/bin/podman start -a rompr + ExecStop: /usr/bin/podman stop rompr + Install: + WantedBy: multi-user.target container-node-red: Unit: Description: Node Red @@ -155,6 +166,7 @@ haproxy: - host_z2m-ws hdr_beg(host) -i zwave2mqtt-ws. - host_pihole hdr_beg(host) -i pihole. - host_nodered hdr_beg(host) -i nodered. + - host_rompr hdr_beg(host) -i rompr. use_backends: - auto if host_auto - auto-conf if host_auto-conf @@ -162,6 +174,7 @@ haproxy: - z2m-ws if host_z2m-ws - pihole if host_pihole - nodered if host_nodered + - rompr if host_rompr backends: backend1: name: auto @@ -221,4 +234,13 @@ haproxy: host: 127.0.0.1 port: 1880 check: check + backend6: + name: rompr + balance: roundrobin + servers: + server1: + name: rompr + host: 127.0.0.1 + port: 8081 + check: check diff --git a/base/hostconfig/truhe.sls b/base/hostconfig/truhe.sls index 1dbaa96..51a8f60 100644 --- a/base/hostconfig/truhe.sls +++ b/base/hostconfig/truhe.sls @@ -1,93 +1,4 @@ -systemd: - service: - container-rompr: - Unit: - Description: Rompr - After: network-online.target local-fs.target - Before: haproxy.service - Service: - ExecStart: /usr/bin/podman start -a rompr - ExecStop: /usr/bin/podman stop rompr - Install: - WantedBy: multi-user.target - -haproxy: - enabled: True - overwrite: True - global: - stats: - enable: True - socketpath: /var/lib/haproxy/stats - mode: 660 - level: admin - # Optional extra bind parameter, for example to set the owner/group on the socket file - extra: user haproxy group haproxy - ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384" - ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11" +os: + release: bullseye - user: haproxy - group: haproxy - chroot: - enable: True - path: /var/lib/haproxy - daemon: True - defaults: - mode: http - stats: - - enable - - uri: '/haproxy-status' - options: - - httplog - - dontlognull - - forwardfor - timeouts: - - connect 5000 - - client 50000 - - server 50000 - - tunnel 80000 #longer timeouts for websockets - - http-request 5s - errorfiles: - 400: /etc/haproxy/errors/400.http - 403: /etc/haproxy/errors/403.http - 408: /etc/haproxy/errors/408.http - 500: /etc/haproxy/errors/500.http - 502: /etc/haproxy/errors/502.http - 503: /etc/haproxy/errors/503.http - 504: /etc/haproxy/errors/504.http - #resolvers: - # local_dns: - # options: - # - nameserver resolvconf 192.168.10.1:53 - # - resolve_retries 3 - # - timeout retry 1s - # - hold valid 10s - listens: - stats: - bind: - - "127.0.0.1:9110" - mode: http - stats: - enable: True - uri: "/haproxy-status" - refresh: "20s" - frontends: - frontend1: - name: www-http - bind: - - "*:80" - default_backend: rompr - acls: - - host_truhe hdr_beg(host) -i truhe. - use_backends: - - rompr if host_truhe - backends: - backend1: - name: rompr - balance: roundrobin - servers: - server1: - name: rompr - host: 127.0.0.1 - port: 8080 - check: check \ No newline at end of file diff --git a/prometheus/node_exporter.sls b/prometheus/node_exporter.sls index 7654267..9eb0d8b 100644 --- a/prometheus/node_exporter.sls +++ b/prometheus/node_exporter.sls @@ -16,4 +16,5 @@ prometheus: collector.diskstats.ignored-devices: ^(ram|loop|fd|zram)\d+$ collector.filesystem.ignored-mount-points: ^/(sys|proc|dev|run)($|/) collector.filesystem.ignored-fs-types: ^(nfs|cifs|glusterfs|autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs|tmpfs)$ - no-collector.systemd: + no-collector.systemd: + no-collector.rapl: