Change obsolete cmd.run parameter user -> runas.
diff --git a/aptly/server/init.sls b/aptly/server/init.sls
index d4ca164..2e865b4 100644
--- a/aptly/server/init.sls
+++ b/aptly/server/init.sls
@@ -163,7 +163,7 @@
import_gpg_pub_key:
cmd.run:
- name: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --import {{ gpgpubfile }}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
- unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-keys | grep '{{ server.gpg.keypair_id }}'
- require:
- file: gpg_pub_key
@@ -172,7 +172,7 @@
import_gpg_priv_key:
cmd.run:
- name: gpg --no-tty --allow-secret-key-import{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --import {{ gpgprivfile }}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
- unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-secret-keys | grep '{{ server.gpg.keypair_id }}'
- require:
- file: aptly_gpg_key_dir
diff --git a/aptly/server/mirrors.sls b/aptly/server/mirrors.sls
index 24be665..8944522 100644
--- a/aptly/server/mirrors.sls
+++ b/aptly/server/mirrors.sls
@@ -45,7 +45,7 @@
gpg_add_keys_{{ mirror_name }}_{{ gpgkey }}:
cmd.run:
- name: gpg --no-tty {% if server.gpg.get('keyring', None) %} --no-default-keyring --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --keyserver {{ mirror.keyserver|default(server.gpg.keyserver) }} {% if server.gpg.get('http_proxy', None) %} --keyserver-options http-proxy={{ server.gpg.get('http_proxy') }} {% endif %} --recv-keys {{ gpgkey }}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
- cwd: {{ server.home_dir }}
- unless: gpg --no-tty {% if server.gpg.get('keyring', None) %} --no-default-keyring --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }} {% endif %} {% if server.gpg.get('http_proxy', None) %} --keyserver-options http-proxy={{ server.gpg.get('http_proxy') }} {% endif %} --list-public-keys {{gpgkey}}
{%- if server.secure %}
@@ -64,7 +64,7 @@
cmd.run:
- name: aptly snapshot create {{ snapshot }} from mirror {{ mirror_name }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- unless: aptly snapshot show {{ snapshot }}
- require:
@@ -79,7 +79,7 @@
cmd.run:
- name: aptly mirror create {% if mirror.get('udebs', False) %}-with-udebs=true {% endif %}{% if mirror.get('sources', False) %}-with-sources=true {% endif %}{% if mirror.get('filter') %}-filter="{{ mirror.filter }}" {% endif %}{% if mirror.get('filter_with_deps') %}-filter-with-deps {% endif %}-architectures={{ mirror.architectures }} {{ mirror_name }} {{ mirror.source }} {{ mirror.distribution }} {{ mirror.components }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- unless: aptly mirror show {{ mirror_name }}
{%- if server.source.engine == "docker" %}
@@ -91,7 +91,7 @@
cmd.run:
- name: aptly mirror edit {% if mirror.get('udebs', False) %}-with-udebs=true {% endif %}{% if mirror.get('sources', False) %}-with-sources=true {% endif %}{% if mirror.get('filter') %}-filter="{{ mirror.filter }}" {% endif %}{% if mirror.get('filter_with_deps') %}-filter-with-deps {% endif %}-architectures={{ mirror.architectures }} {{ mirror_name }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- onlyif: 'aptly mirror show {{ mirror_name }} | grep -v "^Filter: {{ mirror.get('filter', '') }}$" | grep -q "^Filter: "'
{%- if server.source.engine == "docker" %}
@@ -105,7 +105,7 @@
cmd.run:
- name: aptly mirror update {{ mirror_name }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- require:
- cmd: aptly_{{ mirror_name }}_mirror
@@ -120,7 +120,7 @@
cmd.run:
- name: aptly publish snapshot -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' {{ server.mirror[mirror_name].publish }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
{%- if server.source.engine == "docker" %}
- require:
diff --git a/aptly/server/repos.sls b/aptly/server/repos.sls
index c486895..c18c981 100644
--- a/aptly/server/repos.sls
+++ b/aptly/server/repos.sls
@@ -7,7 +7,7 @@
- name: aptly repo create -distribution="{{ repo.distribution }}" -component="{{ repo.component }}" -architectures="{{ repo.architectures }}" -comment="{{ repo.comment }}" {{ repo_name }}
- unless: aptly repo show {{ repo_name }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- require:
- file: aptly_conf
@@ -28,7 +28,7 @@
cmd.run:
- name: aptly repo add {{ repo_name }} {{ repo.pkg_dir }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- require:
- cmd: aptly_{{ repo_name }}_repo_create
@@ -44,7 +44,7 @@
cmd.run:
- name: aptly publish repo -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' {{ repo_name }}
{%- if server.source.engine != "docker" %}
- - user: {{ server.user.name }}
+ - runas: {{ server.user.name }}
{%- endif %}
- unless: aptly publish update -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' {{ repo.distribution }}
{%- endif %}