Change states to use short-dec style

This commit is contained in:
Seth House 2014-12-13 00:19:58 -07:00
parent bbb6c6b270
commit 7f2436b712
2 changed files with 7 additions and 14 deletions

View file

@ -2,11 +2,9 @@
{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %} {% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
apt-cacher-ng: apt-cacher-ng:
pkg: pkg.installed:
- installed
- name: {{ apt_cacher_ng.pkg }} - name: {{ apt_cacher_ng.pkg }}
service: service.running:
- running
- name: {{ apt_cacher_ng.service }} - name: {{ apt_cacher_ng.service }}
- enable: True - enable: True
- watch: - watch:
@ -17,8 +15,7 @@ apt-cacher-ng:
- file: {{ apt_cacher_ng.server_log_dir }} - file: {{ apt_cacher_ng.server_log_dir }}
{{ apt_cacher_ng.server_config }}: {{ apt_cacher_ng.server_config }}:
file: file.managed:
- managed
- user: root - user: root
- group: root - group: root
- mode: '644' - mode: '644'
@ -26,24 +23,21 @@ apt-cacher-ng:
- template: jinja - template: jinja
{{ apt_cacher_ng.server_cache_dir }}: {{ apt_cacher_ng.server_cache_dir }}:
file: file.directory:
- directory
- makedirs: True - makedirs: True
- user: {{ apt_cacher_ng.user }} - user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }} - group: {{ apt_cacher_ng.group }}
- mode: '2755' - mode: '2755'
{{ apt_cacher_ng.server_log_dir }}: {{ apt_cacher_ng.server_log_dir }}:
file: file.directory:
- directory
- makedirs: True - makedirs: True
- user: {{ apt_cacher_ng.user }} - user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }} - group: {{ apt_cacher_ng.group }}
- mode: '2755' - mode: '2755'
{{ apt_cacher_ng.credentials }}: {{ apt_cacher_ng.credentials }}:
file: file.managed:
- managed
- user: {{ apt_cacher_ng.user }} - user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }} - group: {{ apt_cacher_ng.group }}
- mode: '600' - mode: '600'

View file

@ -2,8 +2,7 @@ include:
- apache - apache
apt-cacher: apt-cacher:
pkg: pkg.installed: []
- installed
service.running: service.running:
- enable: True - enable: True
- require: - require: