diff --git a/traefik-2.11.2.tar.gz b/traefik-2.11.2.tar.gz deleted file mode 100644 index 61b45bd..0000000 --- a/traefik-2.11.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16da19eddb64ead57dd1b5e3884b29983e73f762ec41c3b1e89c062f14ad267b -size 9041959 diff --git a/traefik-3.0.0.tar.gz b/traefik-3.0.0.tar.gz new file mode 100644 index 0000000..4d373d5 --- /dev/null +++ b/traefik-3.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ad4fdb9e87af38380f30dd9f47dfc7da10a483e2b4b44770182717d135a0979 +size 9240312 diff --git a/traefik.changes b/traefik.changes index 001df9c..18c3fc9 100644 --- a/traefik.changes +++ b/traefik.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon May 6 12:59:25 UTC 2024 - Johannes Weberhofer + +- Moved configuraton from .toml to .yml config + +- Update to version 3.0.0 + * Announcment: https://traefik.io/blog/announcing-traefik-proxy-v3-rc/ + * added support for popular, emerging technologies—WebAssembly (Wasm), + OpenTelemetry, and Kubernetes Gateway API + * revamped some key parts of the routing rules + * added support for some leading edge technologies like HTTP/3, SPIFFE, and Tailscale + + * Migration guide: https://doc.traefik.io/traefik/v3.0/migration/v2-to-v3/ + + * Details: https://github.com/traefik/traefik/releases/tag/v3.0.0 + ------------------------------------------------------------------- Fri May 3 15:14:17 UTC 2024 - Johannes Weberhofer diff --git a/traefik.service b/traefik.service index 95228dd..47bbefe 100644 --- a/traefik.service +++ b/traefik.service @@ -4,16 +4,17 @@ Documentation=https://doc.traefik.io/traefik/ After=network.target network-online.target Requires=network-online.target AssertFileIsExecutable=/usr/bin/traefik -AssertPathExists=/etc/traefik/traefik.toml +AssertPathExists=/etc/traefik/traefik.yml [Service] Type=notify -ExecStart=/usr/bin/traefik --configFile=/etc/traefik/traefik.toml +ExecStart=/usr/bin/traefik --configFile=/etc/traefik/traefik.yml Restart=always WatchdogSec=1s PrivateTmp=true ProtectSystem=full AmbientCapabilities=CAP_NET_BIND_SERVICE +KillMode=mixed [Install] WantedBy=multi-user.target diff --git a/traefik.spec b/traefik.spec index 70e867e..e469222 100644 --- a/traefik.spec +++ b/traefik.spec @@ -25,7 +25,7 @@ %endif Name: traefik -Version: 2.11.2 +Version: 3.0.0 Release: 0 Summary: The Cloud Native Application Proxy License: MIT @@ -34,7 +34,7 @@ URL: https://traefik.io/ Source0: https://github.com/traefik/traefik/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.gz Source2: traefik.service -Source3: traefik.toml +Source3: traefik.yml Source4: package-lock.json Source5: node_modules.spec.inc # prepare-sources.sh is used to prepare sources for packaging @@ -49,6 +49,8 @@ BuildRequires: systemd-rpm-macros BuildRequires: yarn BuildRequires: (golang(API) >= 1.22) Recommends: podman + +Conflicts: traefik2 %{?systemd_requires} %{go_provides} @@ -99,7 +101,7 @@ install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} # configuration -install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.toml +install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.yml mkdir -p %{buildroot}%{_sysconfdir}/%{name}/conf.d # logging @@ -129,7 +131,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/conf.d -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.toml +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.yml %attr(750,root,root) %dir %{_localstatedir}/log/%{name} %changelog diff --git a/traefik.toml b/traefik.toml deleted file mode 100644 index 928d85d..0000000 --- a/traefik.toml +++ /dev/null @@ -1,215 +0,0 @@ -################################################################ -# -# Configuration sample for Traefik v2. -# -################################################################ - -################################################################ -# Global configuration -################################################################ -[global] - checkNewVersion = false - sendAnonymousUsage = false - -#[tls.options] -# [tls.options.default] -# sniStrict = true - -################################################################ -# As the HTTP/3 spec is still in draft, HTTP/3 support in -# Traefik is an experimental feature and needs to be activated -# in the experimental section of the static configuration. -# -# Will be a stable feature starting with version 3 -# -# https://doc.traefik.io/traefik/routing/entrypoints/#http3 -################################################################ -#[experimental] -# http3 = true - -################################################################ -# Entrypoints configuration -# -# https://doc.traefik.io/traefik/routing/entrypoints/ -################################################################ - -# Optional -# Default: -[entryPoints] - [entryPoints.web] - address = ":80" - -## Redirect all requests incoming from http to https -## websecure/https must be enabled to be use this configuration -## -## https://doc.traefik.io/traefik/routing/entrypoints/#redirection -## -# [entryPoints.web.http] -# [entryPoints.web.http.redirections] -# [entryPoints.web.http.redirections.entryPoint] -# to = "websecure" -# scheme = "https" - -## Enable the https endpoint at port 443 -## -# [entryPoints.websecure] -# address = ":443" - -## Enable the http3 and advertize it at UDP port 443 -## In Version 2.x the experimental http3 feature must be enabled -# [entryPoints.websecure.http3] -# advertisedPort = 443 - -################################################################ -# Traefik logs configuration -# -# https://doc.traefik.io/traefik/observability/logs/ -################################################################ - -# Traefik logs -# Enabled by default and log to stdout -# -# Optional -# -[log] - - # Log level - # - # Optional - # Default: "ERROR" - # - # level = "DEBUG" - - # Sets the filepath for the traefik log. If not specified, stdout will be used. - # Intermediate directories are created if necessary. - # - # Optional - # Default: os.Stdout - # - # filePath = "/var/log/traefik/traefik.log" - - # Format is either "json" or "common". - # - # Optional - # Default: "common" - # - # format = "json" - -################################################################ -# Access logs configuration -# -# https://doc.traefik.io/traefik/observability/access-logs/ -################################################################ - -# Enable access logs -# By default it will write to stdout and produce logs in the textual -# Common Log Format (CLF), extended with additional fields. -# -# Optional -# [accessLog] - - # Sets the file path for the access log. If not specified, stdout will be used. - # Intermediate directories are created if necessary. - # - # Optional - # Default: os.Stdout - # - # filePath = "/var/log/traefik/access.log" - - # Format is either "json" or "common". - # - # Optional - # Default: "common" - # - # format = "json" - -################################################################ -# API and dashboard configuration -# -# https://doc.traefik.io/traefik/operations/api/ -################################################################ - -# Enable API and dashboard -[api] - - # Enable the API in insecure mode - # - # Optional - # Default: false - # - #insecure = true - - # Enabled Dashboard - # - # Optional - # Default: true - # - # dashboard = false - -################################################################ -# Ping configuration -# -# https://doc.traefik.io/traefik/operations/ping/ -################################################################ - -# Enable ping -[ping] - - # Name of the related entry point - # - # Optional - # Default: "traefik" - # - # entryPoint = "traefik" - -################################################################ -# Docker configuration provider -# -# https://doc.traefik.io/traefik/providers/docker/ -################################################################ - -# Enable Docker configuration provider -#[providers.docker] - - # Docker server endpoint. Can be a tcp or a unix socket endpoint. - # - # Required - # Default: "unix:///var/run/docker.sock" - # - # endpoint = "tcp://10.10.10.10:2375" - - # Default host rule. - # - # Optional - # Default: "Host(`{{ normalize .Name }}`)" - # - # defaultRule = "Host(`{{ normalize .Name }}.docker.localhost`)" - - # Expose containers by default in traefik - # - # Optional - # Default: true - # - # exposedByDefault = false - -################################################################ -# File provider backend -# -# https://doc.traefik.io/traefik/providers/file/ -################################################################ - -# Enable File configuration provider -[providers.file] - - # Defines the path to the directory that contains the - # configuration files. - # Default: unset - # - directory = "/etc/traefik/conf.d" - - # Set the watch option to true to allow Traefik to automatically - # watch for file changes - # Default: false - # - watch = true - diff --git a/traefik.yml b/traefik.yml new file mode 100644 index 0000000..33c8139 --- /dev/null +++ b/traefik.yml @@ -0,0 +1,141 @@ +# ------------------------------------------------------------------------ +# Configuration for Traefik v3 +# ------------------------------------------------------------------------ + +# ------------------------------------------------------------------------ +# Global configuration +# ------------------------------------------------------------------------ +global: + checkNewVersion: false + sendAnonymousUsage: false + +# ------------------------------------------------------------------------ +# TLS specific configuration +# ------------------------------------------------------------------------ +#tls: +# options: +# default: +# sniStrict: true + +# ------------------------------------------------------------------------ +# Entrypoints configuration +# https://doc.traefik.io/traefik/routing/entrypoints/ +# ------------------------------------------------------------------------ +entryPoints: + web: + address: ":80" + # ------------------------------------------------------------------------ + # Redirect all requests incoming from http to https + # websecure/https must be enabled to be use this configuration + # https://doc.traefik.io/traefik/routing/entrypoints/#redirection + # ------------------------------------------------------------------------ + #http: + # redirections: + # entryPoint: + # to: websecure + # scheme: https + + # ------------------------------------------------------------------------ + # Enable the https endpoint at port 443 + # ------------------------------------------------------------------------ + #websecure: + # address: :443 + + # ------------------------------------------------------------------------ + # Enable the http3 and advertize it at UDP port 443 + # ------------------------------------------------------------------------ + #http3: + # advertisedPort: 443 + + +# ------------------------------------------------------------------------ +# Traefik logs configuration +# Enabled if uncommented +# https://doc.traefik.io/traefik/observability/logs/ +# ------------------------------------------------------------------------ +log: + # Set traefik's log-level + # Default: ERROR + #level: DEBUG + + +# ------------------------------------------------------------------------ +# Traefik access-log destination and format +# uncomment to enable +# https://doc.traefik.io/traefik/observability/logs/ +# ------------------------------------------------------------------------ +#accessLog: + # ------------------------------------------------------------------------ + # Set the filepath for the traefik log-file. + # Default: os.Stdout + #filePath: /var/log/traefik/traefik.log + # ------------------------------------------------------------------------ + # Write logs in the 'common' or 'json' format. + # Default: common + #format: json + + +# ------------------------------------------------------------------------ +# API and dashboard configuration. +# Uncomment to enable +# https://doc.traefik.io/traefik/operations/api/ +# ------------------------------------------------------------------------ +api: + # ------------------------------------------------------------------------ + # Enable the API in insecure mode + # Default: false + insecure: false + # ------------------------------------------------------------------------ + # Enable the dashboard + # Default: true + dashboard: true + + +# ------------------------------------------------------------------------ +# Ping configuration +# https://doc.traefik.io/traefik/operations/ping/ +# -------------------------------------------------------------------------- +ping: +# -------------------------------------------------------------------------- + # Name of the related entry point + # Default: "traefik" + entryPoint: traefik + + +# -------------------------------------------------------------------------- +# Provider configuration +# -------------------------------------------------------------------------- +providers: + # ------------------------------------------------------------------------ + # Docker configuration provider + # Default: disabled + # https://doc.traefik.io/traefik/providers/docker/ + # ------------------------------------------------------------------------ + #docker: + # ---------------------------------------------------------------------- + # Docker server endpoint. Can be a tcp or a unix socket endpoint. + # Default: "unix:///var/run/docker.sock" + #endpoint: tcp://10.10.10.10:2375 + # ---------------------------------------------------------------------- + # defaultRule: Host(`{{ normalize .Name }}.docker.localhost`) + # ---------------------------------------------------------------------- + # Expose containers by default in traefik + # Default: true + #exposedByDefault: false + + # ------------------------------------------------------------------------ + # File configuration provider + # Default: disabled + # https://doc.traefik.io/traefik/providers/docker/ + # ------------------------------------------------------------------------ + file: + # ---------------------------------------------------------------------- + # Defines the path to the directory that contains the configuration files. + # Default: unset + directory: /etc/traefik/conf.d + # ---------------------------------------------------------------------- + # Set the watch option to true to allow Traefik to automatically + # watch for file changes + # Default: false + watch: true + diff --git a/vendor.tar.gz b/vendor.tar.gz index aab57c7..28c9654 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3aa6f198ca0431d292b19bb3354850e0d82d1f8184975680dc227012487e38d -size 22470288 +oid sha256:b45aff78bee021a9ee84cfea0c3dcfa95aabf97ef744b47e8a0194cff459652d +size 21545629