updated go-aptproxy state

This commit is contained in:
Paul 2021-11-27 13:34:59 +01:00
parent 07ebd0facd
commit 2c941ef467
4 changed files with 12 additions and 12 deletions

View File

@ -1,19 +1,19 @@
--- ---
{%- from "go-aptproxy/map.jinja" import go-aptproxy with context %} {%- from "go-aptproxy/map.jinja" import goaptproxy with context %}
go-aptproxy-archive-extract: go-aptproxy-archive-extract:
archive.extracted: archive.extracted:
- name: {{ go-aptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }} - name: {{ goaptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }}
- source: {{ go-aptproxy.mirror }}/{{ go-aptproxy.version }}/go-aptproxy-{{ go-aptproxy.version }}-{{ go-aptproxy.os }}-{{ go-aptproxy.arch }}.tar.gz - source: {{ goaptproxy.mirror }}/{{ go-aptproxy.version }}/go-aptproxy-{{ go-aptproxy.version }}-{{ go-aptproxy.os }}-{{ go-aptproxy.arch }}.tar.gz
- skip_verify: true - skip_verify: true
- enforce_toplevel: false - enforce_toplevel: false
- if_missing: {{ go-aptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }} - if_missing: {{ goaptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }}
- watch_in: - watch_in:
- service: go-aptproxy-service - service: go-aptproxy-service
go-aptproxy-binary-symlink: go-aptproxy-binary-symlink:
file.symlink: file.symlink:
- name: {{ go-aptproxy.install_dir }}/go-aptproxy - name: {{ goaptproxy.install_dir }}/go-aptproxy
- target: {{ go-aptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }} - target: {{ goaptproxy.release_dir }}/go-aptproxy-{{ go-aptproxy.version }}
- require: - require:
- archive: go-aptproxy-archive-extract - archive: go-aptproxy-archive-extract
- watch_in: - watch_in:
@ -22,5 +22,5 @@ go-aptproxy-binary-symlink:
go-aptproxy-cleanup: go-aptproxy-cleanup:
software.cleanup: software.cleanup:
- name: go-aptproxy - name: go-aptproxy
- path: {{ go-aptproxy.release_dir }} - path: {{ goaptproxy.release_dir }}
- version: {{ go-aptproxy.version }} - version: {{ goaptproxy.version }}

View File

@ -11,4 +11,4 @@
) )
-%} -%}
{%- set go-aptproxy = salt['pillar.get']('go-aptproxy', default=defaults, merge=True) -%} {%- set goaptproxy = salt['pillar.get']('go-aptproxy', default=defaults, merge=True) -%}

View File

@ -1,5 +1,5 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
{%- from "go-aptproxy/map.jinja" import go-aptproxy with context %} {%- from "go-aptproxy/map.jinja" import goaptproxy with context %}
[Unit] [Unit]
Description=go-aptproxy Description=go-aptproxy
Documentation=https://git.paulbsd.com/paulbsd/go-aptproxy Documentation=https://git.paulbsd.com/paulbsd/go-aptproxy
@ -7,7 +7,7 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStart={{ go-aptproxy.install_dir }}/go-aptproxy/go-aptproxy -directory {{ go-aptproxy.working_dir }} -port {{ go-aptproxy.port }} ExecStart={{ goaptproxy.install_dir }}/go-aptproxy/go-aptproxy -directory {{ goaptproxy.working_dir }} -port {{ goaptproxy.port }}
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure Restart=on-failure
RestartForceExitStatus=SIGPIPE RestartForceExitStatus=SIGPIPE

View File

@ -1,5 +1,5 @@
--- ---
{%- from "go-aptproxy/map.jinja" import go-aptproxy with context %} {%- from "go-aptproxy/map.jinja" import goaptproxy with context %}
go-aptproxy-service-file: go-aptproxy-service-file:
file.managed: file.managed:
- name: /etc/systemd/system/go-aptproxy.service - name: /etc/systemd/system/go-aptproxy.service