From 3a640f10d80c70cae3b6af109b199d76db9c6b42 Mon Sep 17 00:00:00 2001 From: pgrondek Date: Mon, 8 Jun 2020 19:01:19 +0200 Subject: [PATCH] Add haproxy to octoprint --- roles/octoprint/files/etc/haproxy/haproxy.cfg | 13 +++++++++++++ roles/octoprint/tasks/install.yml | 9 +++++---- roles/octoprint/tasks/main.yml | 1 + roles/octoprint/tasks/proxy.yml | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 roles/octoprint/files/etc/haproxy/haproxy.cfg create mode 100644 roles/octoprint/tasks/proxy.yml diff --git a/roles/octoprint/files/etc/haproxy/haproxy.cfg b/roles/octoprint/files/etc/haproxy/haproxy.cfg new file mode 100644 index 0000000..231faf3 --- /dev/null +++ b/roles/octoprint/files/etc/haproxy/haproxy.cfg @@ -0,0 +1,13 @@ +global + daemon + maxconn 256 + +defaults + mode http + timeout connect 5000ms + timeout client 50000ms + timeout server 50000ms + +listen http-in + bind *:80 + server server1 127.0.0.1:5000 maxconn 32 diff --git a/roles/octoprint/tasks/install.yml b/roles/octoprint/tasks/install.yml index 1234b58..1f1ad49 100644 --- a/roles/octoprint/tasks/install.yml +++ b/roles/octoprint/tasks/install.yml @@ -32,10 +32,11 @@ virtualenv: /home/octoprint name: - https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/archive/master.zip - - https://github.com/paukstelis/OctoPrint-Cancelobject/archive/master.zip - - https://github.com/OllisGit/OctoPrint-DeleteAfterPrint/releases/latest/download/master.zip - - https://github.com/malnvenshorn/OctoPrint-FilamentManager/archive/master.zip + - https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails/archive/master.zip - https://github.com/juniorRubyist/OctoPrint-OctoFlat/archive/master.zip - https://github.com/kanocz/octopi_eta_override/archive/master.zip - - https://github.com/Renaud11232/OctoPrint-Resource-Monitor/archive/master.zip + - https://github.com/malnvenshorn/OctoPrint-FilamentManager/archive/master.zip + - https://github.com/OllisGit/OctoPrint-DeleteAfterPrint/releases/latest/download/master.zip - https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/master.zip + - https://github.com/paukstelis/OctoPrint-Cancelobject/archive/master.zip + - https://github.com/Renaud11232/OctoPrint-Resource-Monitor/archive/master.zip diff --git a/roles/octoprint/tasks/main.yml b/roles/octoprint/tasks/main.yml index 98fa87a..7b32647 100644 --- a/roles/octoprint/tasks/main.yml +++ b/roles/octoprint/tasks/main.yml @@ -5,3 +5,4 @@ - import_tasks: service.yml +- import_tasks: proxy.yml diff --git a/roles/octoprint/tasks/proxy.yml b/roles/octoprint/tasks/proxy.yml new file mode 100644 index 0000000..dc370f8 --- /dev/null +++ b/roles/octoprint/tasks/proxy.yml @@ -0,0 +1,19 @@ +--- +- become: yes + block: + - name: install needed tools + apt: + update_cache: yes + pkg: + - haproxy + + - name: copy ha config + copy: + src: etc/haproxy/haproxy.cfg + dest: /etc/haproxy/haproxy.cfg + + - name: restart haproxy + systemd: + state: restarted + daemon_reload: yes + name: haproxy