From 024178736b4e046fc63b7c05696598cb9d2dd7ec Mon Sep 17 00:00:00 2001 From: RemiZOffAlex Date: Wed, 27 May 2026 10:54:01 +0300 Subject: [PATCH] Update --- base/etc/dnf/dnf.conf | 12 +++++++ {traefik => base/etc/traefik}/conf.d/app.yml | 7 ++-- base/etc/traefik/traefik.yml | 35 ++++++++++++++++++++ base/root/pre.sh | 6 ++++ base/root/traefik.sh | 7 ++++ traefik/traefik.yml | 19 ----------- 6 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 base/etc/dnf/dnf.conf rename {traefik => base/etc/traefik}/conf.d/app.yml (81%) create mode 100644 base/etc/traefik/traefik.yml create mode 100755 base/root/pre.sh create mode 100755 base/root/traefik.sh delete mode 100644 traefik/traefik.yml diff --git a/base/etc/dnf/dnf.conf b/base/etc/dnf/dnf.conf new file mode 100644 index 0000000..bba247f --- /dev/null +++ b/base/etc/dnf/dnf.conf @@ -0,0 +1,12 @@ +[main] +gpgcheck=1 +installonly_limit=3 +clean_requirements_on_remove=True +best=False +skip_if_unavailable=True +#zchunk=False +fastestmirror=True +#max_parallel_downloads=10 +#ip_resolve=4 +#minrate=300k +#timeout=20 diff --git a/traefik/conf.d/app.yml b/base/etc/traefik/conf.d/app.yml similarity index 81% rename from traefik/conf.d/app.yml rename to base/etc/traefik/conf.d/app.yml index 9af801f..d4c8cf0 100644 --- a/traefik/conf.d/app.yml +++ b/base/etc/traefik/conf.d/app.yml @@ -12,7 +12,9 @@ http: HostRegexp(`.+`) entryPoints: - web + - websecure service: default + tls: false services: default: @@ -23,8 +25,3 @@ http: timeout: 3s servers: - url: "http://app:5000/" - -# providers: -# docker: -# endpoint: "unix:///var/run/docker.sock" -# exposedByDefault: false diff --git a/base/etc/traefik/traefik.yml b/base/etc/traefik/traefik.yml new file mode 100644 index 0000000..1e96366 --- /dev/null +++ b/base/etc/traefik/traefik.yml @@ -0,0 +1,35 @@ +log: + # level: DEBUG + level: INFO +accessLog: {} + +api: + insecure: true + dashboard: true + debug: true + disabledashboardad: false + +entryPoints: + traefik: + address: :9009 + web: + address: :80 + websecure: + address: :443 + http: + tls: {} + +providers: + file: + directory: /etc/traefik/conf.d + watch: true + # http: + # endpoint: "http://127.0.0.1:9000/api" + # pollInterval: 42s + # pollTimeout: 42s + # tls: + # ca: foobar + # caOptional: true + # cert: foobar + # key: foobar + # insecureSkipVerify: true diff --git a/base/root/pre.sh b/base/root/pre.sh new file mode 100755 index 0000000..5b9d8aa --- /dev/null +++ b/base/root/pre.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -e + +dnf -y install wget tar +dnf clean all diff --git a/base/root/traefik.sh b/base/root/traefik.sh new file mode 100755 index 0000000..313870c --- /dev/null +++ b/base/root/traefik.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +wget https://github.com/traefik/traefik/releases/download/${TRAEFIKVERSION}/traefik_${TRAEFIKVERSION}_linux_amd64.tar.gz +tar --directory=/usr/local/bin -xzf traefik_${TRAEFIKVERSION}_linux_amd64.tar.gz traefik +rm -rf traefik_${TRAEFIKVERSION}_linux_amd64.tar.gz diff --git a/traefik/traefik.yml b/traefik/traefik.yml deleted file mode 100644 index 0baea38..0000000 --- a/traefik/traefik.yml +++ /dev/null @@ -1,19 +0,0 @@ -log: - # level: INFO - level: DEBUG -accessLog: {} - -api: - insecure: true - dashboard: true - debug: true - disabledashboardad: false - -entryPoints: - web: - address: ":80" - -providers: - file: - directory: "/etc/traefik/conf.d" - watch: true