Browse Source

Remove trailing whitespace.

tags/v0.7.0
Adam Bolte 8 years ago
parent
commit
023f7c55e3
No account linked to committer's email address
6 changed files with 9 additions and 10 deletions
  1. +1
    -1
      apt/preferences.sls
  2. +0
    -1
      apt/repositories.sls
  3. +1
    -1
      apt/templates/periodic_config.jinja
  4. +2
    -2
      apt/templates/unattended_config.jinja
  5. +1
    -1
      apt/unattended.sls
  6. +4
    -4
      pillar.example

+ 1
- 1
apt/preferences.sls View File

file.managed: file.managed:
- mode: '0644' - mode: '0644'
- user: root - user: root
- group: root
- group: root
- contents: - contents:
- "{{ 'Package: ' ~ p_package }}" - "{{ 'Package: ' ~ p_package }}"
- "{{ 'Pin: ' ~ args.pin }}" - "{{ 'Pin: ' ~ args.pin }}"

+ 0
- 1
apt/repositories.sls View File

- clean_file: true - clean_file: true
{%- endfor %} {%- endfor %}
{% endfor %} {% endfor %}


+ 1
- 1
apt/templates/periodic_config.jinja View File

{% set unattended_upgrade = unattended.get('unattended_upgrade', '1') -%} {% set unattended_upgrade = unattended.get('unattended_upgrade', '1') -%}
{% set auto_clean_interval = unattended.get('auto_clean_interval', '7') -%} {% set auto_clean_interval = unattended.get('auto_clean_interval', '7') -%}
{% set verbose = unattended.get('verbose', '2') -%} {% set verbose = unattended.get('verbose', '2') -%}
APT::Periodic::Enable "{{ enabled }}";
APT::Periodic::Enable "{{ enabled }}";
APT::Periodic::Update-Package-Lists "{{ update_package_lists }}"; APT::Periodic::Update-Package-Lists "{{ update_package_lists }}";
APT::Periodic::Download-Upgradeable-Packages "{{ download_upgradeable_packages }}"; APT::Periodic::Download-Upgradeable-Packages "{{ download_upgradeable_packages }}";
APT::Periodic::Unattended-Upgrade "{{ unattended_upgrade }}"; APT::Periodic::Unattended-Upgrade "{{ unattended_upgrade }}";

+ 2
- 2
apt/templates/unattended_config.jinja View File

Unattended-Upgrade::Allowed-Origins { Unattended-Upgrade::Allowed-Origins {
{%- for pattern in allowed_origins %} {%- for pattern in allowed_origins %}
"{{ pattern }}"; "{{ pattern }}";
{%- endfor %}
{%- endfor %}
}; };
Unattended-Upgrade::Package-Blacklist { Unattended-Upgrade::Package-Blacklist {
{%- for package in package_blacklist %} {%- for package in package_blacklist %}
"{{ package }}"; "{{ package }}";
{%- endfor %}
{%- endfor %}
}; };
Unattended-Upgrade::AutoFixInterruptedDpkg "{{ auto_fix_interrupted_dpkg }}"; Unattended-Upgrade::AutoFixInterruptedDpkg "{{ auto_fix_interrupted_dpkg }}";
Unattended-Upgrade::MinimalSteps "{{ minimal_steps }}"; Unattended-Upgrade::MinimalSteps "{{ minimal_steps }}";

+ 1
- 1
apt/unattended.sls View File

- pkgs: - pkgs:
{% for pkg in apt_map.pkgs %} {% for pkg in apt_map.pkgs %}
- {{ pkg }} - {{ pkg }}
{% endfor %}
{% endfor %}


{{ apt_map.confd_dir }}/{{ apt_map.unattended_config }}: {{ apt_map.confd_dir }}/{{ apt_map.unattended_config }}:
file.managed: file.managed:

+ 4
- 4
pillar.example View File

unattended: unattended:
allowed_origins: allowed_origins:
- origin1 - origin1
- origin2
package_blacklist:
- origin2
package_blacklist:
- package1 - package1
- package2
auto_fix_interrupted_dpkg: true
- package2
auto_fix_interrupted_dpkg: true
minimal_steps: false minimal_steps: false
install_on_shutdown: false install_on_shutdown: false
mail: root mail: root

Loading…
Cancel
Save