瀏覽代碼

Merge pull request #6 from saltstack-formulas/style-short-dec

Change states to use short-dec style
tags/v0.5.0
Wolodja Wentland 10 年之前
父節點
當前提交
b1d7ca1094
共有 2 個檔案被更改,包括 7 行新增14 行删除
  1. +6
    -12
      apt-cacher/ng/server.sls
  2. +1
    -2
      apt-cacher/server.sls

+ 6
- 12
apt-cacher/ng/server.sls 查看文件

@@ -2,11 +2,9 @@
{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}

apt-cacher-ng:
pkg:
- installed
pkg.installed:
- name: {{ apt_cacher_ng.pkg }}
service:
- running
service.running:
- name: {{ apt_cacher_ng.service }}
- enable: True
- watch:
@@ -17,8 +15,7 @@ apt-cacher-ng:
- file: {{ apt_cacher_ng.server_log_dir }}

{{ apt_cacher_ng.server_config }}:
file:
- managed
file.managed:
- user: root
- group: root
- mode: '644'
@@ -26,24 +23,21 @@ apt-cacher-ng:
- template: jinja

{{ apt_cacher_ng.server_cache_dir }}:
file:
- directory
file.directory:
- makedirs: True
- user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }}
- mode: '2755'

{{ apt_cacher_ng.server_log_dir }}:
file:
- directory
file.directory:
- makedirs: True
- user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }}
- mode: '2755'

{{ apt_cacher_ng.credentials }}:
file:
- managed
file.managed:
- user: {{ apt_cacher_ng.user }}
- group: {{ apt_cacher_ng.group }}
- mode: '600'

+ 1
- 2
apt-cacher/server.sls 查看文件

@@ -2,8 +2,7 @@ include:
- apache

apt-cacher:
pkg:
- installed
pkg.installed: []
service.running:
- enable: True
- require:

Loading…
取消
儲存