diff --git a/traccar/Dockerfile b/traccar/Dockerfile index fff2990..2cf11a5 100755 --- a/traccar/Dockerfile +++ b/traccar/Dockerfile @@ -21,7 +21,7 @@ RUN \ xmlstarlet=1.6.1-r0 \ \ && curl -J -L -o /tmp/traccar.zip \ - "https://github.com/traccar/traccar/releases/download/v4.15/traccar-other-4.15.zip" \ + "https://github.com/traccar/traccar/releases/download/v5.0/traccar-other-5.0.zip" \ \ && mkdir -p /opt/traccar \ && unzip -d /opt/traccar /tmp/traccar.zip \ diff --git a/traccar/config.yaml b/traccar/config.yaml index 25ac6dd..10862a5 100644 --- a/traccar/config.yaml +++ b/traccar/config.yaml @@ -4,9 +4,8 @@ version: dev slug: traccar description: Modern GPS Tracking Platform url: https://github.com/hassio-addons/addon-traccar +webui: "[PROTO:ssl]://[HOST]:[PORT:80]/modern/" codenotary: codenotary@frenck.dev -ingress: true -ingress_port: 0 panel_icon: mdi:car-connected startup: services arch: @@ -15,16 +14,16 @@ arch: init: false host_network: true ports: - 80/tcp: null + 80/tcp: 8082 ports_description: - 80/tcp: Web interface (Not required for Ingress) + 80/tcp: Web interface map: - config:rw - ssl services: - mysql:want options: - ssl: true + ssl: false certfile: fullchain.pem keyfile: privkey.pem schema: diff --git a/traccar/rootfs/etc/cont-init.d/nginx.sh b/traccar/rootfs/etc/cont-init.d/nginx.sh index 43aaec8..b84c861 100644 --- a/traccar/rootfs/etc/cont-init.d/nginx.sh +++ b/traccar/rootfs/etc/cont-init.d/nginx.sh @@ -4,14 +4,6 @@ # Configures NGINX for use with the Traccar server # ============================================================================== -# Generate Ingress configuration -bashio::var.json \ - interface "$(bashio::addon.ip_address)" \ - port "$(bashio::addon.ingress_port)" \ - | tempio \ - -template /etc/nginx/templates/ingress.gtpl \ - -out /etc/nginx/servers/ingress.conf - # Generate direct access configuration, if enabled. if bashio::var.has_value "$(bashio::addon.port 80)"; then bashio::config.require.ssl diff --git a/traccar/rootfs/etc/nginx/templates/ingress.gtpl b/traccar/rootfs/etc/nginx/templates/ingress.gtpl deleted file mode 100644 index d03deff..0000000 --- a/traccar/rootfs/etc/nginx/templates/ingress.gtpl +++ /dev/null @@ -1,19 +0,0 @@ -server { - listen {{ .interface }}:{{ .port }} default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - allow 172.30.32.2; - deny all; - - location ~* /session$ { - proxy_set_header Content-Type application/x-www-form-urlencoded; - proxy_pass http://backend; - } - - location / { - proxy_set_header Content-Type application/json; - proxy_pass http://backend; - } -}