From da5fb4dc202b266d1f1daf0fedc792c0606cb4be Mon Sep 17 00:00:00 2001 From: shnee Date: Tue, 15 Mar 2022 21:20:24 -0400 Subject: [PATCH] Updates for nuster. --- pkg-cache.yml | 14 ++++++++------ templates/haproxy.cfg.j2 | 9 +++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg-cache.yml b/pkg-cache.yml index 199fa62..d0397ba 100644 --- a/pkg-cache.yml +++ b/pkg-cache.yml @@ -5,6 +5,7 @@ vars: install_docker: false + # TODO remove this if unused. # This object represents the uid/gid for the haproxy user/group in the # haproxy container. haproxy_user: @@ -14,7 +15,7 @@ gid: &haproxy_gid 99 persistent_data_directory: /media1/srv/pkg-cache host_cert_file: "{{ persistent_data_directory }}/{{ cert_name }}" - host_config_file: "{{ persistent_data_directory }}/haproxy.cfg" + host_config_file: "{{ persistent_data_directory }}/nuster.cfg" permissions: &persistent_data_permissions # owner: gert # group: gert @@ -40,9 +41,9 @@ mode: '0750' become: true - - name: Create haproxy config file. + - name: Create nuster config file. ansible.builtin.template: - src: templates/haproxy.cfg.j2 + src: templates/nuster.cfg.j2 dest: "{{ host_config_file }}" <<: *persistent_data_permissions become: true @@ -55,9 +56,9 @@ mode: '0600' become: true - - name: Start the haproxy container. + - name: Start the nuster container. community.docker.docker_container: - image: haproxy + image: nuster/nuster:5.3.0.23-alpine name: pkg-cache state: started restart: true @@ -66,8 +67,9 @@ # published_ports: # - 4433:4433 volumes: - - "{{ host_config_file }}:/usr/local/etc/haproxy/haproxy.cfg" + - "{{ host_config_file }}:/etc/nuster/nuster.cfg" - "{{ host_cert_file }}:{{ container_cert_file }}" + - "{{ persistent_data_directory }}/cache:/cache" env: VIRTUAL_HOST: pkg.shnee.net VIRTAUL_PORT: "8080" diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2 index 5a66b6c..3c9bf9f 100644 --- a/templates/haproxy.cfg.j2 +++ b/templates/haproxy.cfg.j2 @@ -2,6 +2,7 @@ global log stdout format raw local0 # uid {{ haproxy_user.uid }} # gid {{ haproxy_user.gid }} + nuster cache on dir /cache defaults log global @@ -12,18 +13,14 @@ defaults timeout server 10s timeout http-request 10s -cache pkg_cache - total-max-size 4095 - max-object-size 524288000 - frontend http_frontend # bind *:4433 ssl crt {{ container_cert_file }} bind *:8080 default_backend pkg_repo backend pkg_repo - http-request cache-use pkg_cache - http-response cache-store pkg_cache + nuster cache on + nuster rule r1 disk on memory off option forwardfor server server1 mirrors.gigenet.com:443 ssl