From e41d54617f7775b0ef996cc86d512523116ceec1 Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sat, 24 Dec 2022 17:48:15 +0100 Subject: [PATCH] updated install.sls files --- states/docker/install.sls | 4 ++-- states/haproxy/install.sls | 2 +- states/kitty/install.sls | 2 +- states/neovim/install.sls | 4 ++-- states/nftables/install.sls | 2 +- states/opendkim/install.sls | 2 +- states/php/install.sls | 2 +- states/pkg/install.sls | 2 +- states/postfix/install.sls | 2 +- states/postgresql/install.sls | 2 +- states/redis/install.sls | 2 +- states/rsync/install.sls | 4 ++-- states/samba/install.sls | 2 +- states/time/install.sls | 2 +- states/transmission/install.sls | 4 ++-- states/vim/install.sls | 4 ++-- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/states/docker/install.sls b/states/docker/install.sls index 72261d0..3e1ddc6 100644 --- a/states/docker/install.sls +++ b/states/docker/install.sls @@ -1,11 +1,11 @@ --- {%- from "docker/map.jinja" import docker with context %} docker-pkgs: - pkg.latest: + pkg.installed: - pkgs: {{ docker.pkgs }} docker-pip-pkgs: pip.installed: {%- for pip in docker.pip_pkgs %} - name: {{ pip }} -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/haproxy/install.sls b/states/haproxy/install.sls index ea3298a..138b147 100644 --- a/states/haproxy/install.sls +++ b/states/haproxy/install.sls @@ -1,7 +1,7 @@ --- {%- from "haproxy/map.jinja" import haproxy with context %} haproxy-pkg: - pkg.latest: + pkg.installed: - pkgs: {{ haproxy.packages }} haproxy-config-dir: diff --git a/states/kitty/install.sls b/states/kitty/install.sls index 727c7ba..ae7e852 100644 --- a/states/kitty/install.sls +++ b/states/kitty/install.sls @@ -1,5 +1,5 @@ --- {%- from "kitty/map.jinja" import kitty with context %} kitty-pkg: - pkg.latest: + pkg.installed: - name: kitty diff --git a/states/neovim/install.sls b/states/neovim/install.sls index da3e78e..29e0e39 100644 --- a/states/neovim/install.sls +++ b/states/neovim/install.sls @@ -1,7 +1,7 @@ --- {%- from "neovim/map.jinja" import neovim with context %} neovim-pkg: - pkg.latest: + pkg.installed: - pkgs: - git - neovim @@ -14,4 +14,4 @@ neovim-neovimfiles-directory: neovim-colors-directory: file.directory: - name: {{ neovim.colors_dir }} - - makedirs: true \ No newline at end of file + - makedirs: true diff --git a/states/nftables/install.sls b/states/nftables/install.sls index 9f6d8fe..595ae4d 100644 --- a/states/nftables/install.sls +++ b/states/nftables/install.sls @@ -1,5 +1,5 @@ --- {%- from "nftables/map.jinja" import nftables with context %} nftables-pkg: - pkg.latest: + pkg.installed: - name: nftables diff --git a/states/opendkim/install.sls b/states/opendkim/install.sls index b076641..d43338b 100644 --- a/states/opendkim/install.sls +++ b/states/opendkim/install.sls @@ -1,7 +1,7 @@ --- {%- from "opendkim/map.jinja" import opendkim with context %} opendkim-pkg: - pkg.latest: + pkg.installed: - pkgs: - opendkim - opendkim-tools diff --git a/states/php/install.sls b/states/php/install.sls index b5ca785..f7d37b5 100644 --- a/states/php/install.sls +++ b/states/php/install.sls @@ -1,7 +1,7 @@ --- {%- from "php/map.jinja" import php with context %} php-pkgs: - pkg.latest: + pkg.installed: - pkgs: {{ php.pkgs }} - watch_in: - service: php-fpm-service diff --git a/states/pkg/install.sls b/states/pkg/install.sls index bd19f09..414e909 100644 --- a/states/pkg/install.sls +++ b/states/pkg/install.sls @@ -2,7 +2,7 @@ {%- from "pkg/map.jinja" import pkg with context %} {%- if pkg.aptpkgs|length > 0 %} pkg-install: - pkg.latest: + pkg.installed: - pkgs: {%- for pkg in pkg.aptpkgs %} - {{ pkg }} diff --git a/states/postfix/install.sls b/states/postfix/install.sls index 6522be3..bf2325c 100644 --- a/states/postfix/install.sls +++ b/states/postfix/install.sls @@ -1,5 +1,5 @@ --- {%- from "postfix/map.jinja" import postfix with context %} postfix-pkg: - pkg.latest: + pkg.installed: - pkgs: {{ postfix.pkgs }} diff --git a/states/postgresql/install.sls b/states/postgresql/install.sls index 438fb68..ae68566 100644 --- a/states/postgresql/install.sls +++ b/states/postgresql/install.sls @@ -1,7 +1,7 @@ --- {%- from "postgresql/map.jinja" import postgresql with context %} postgresql-install: - pkg.latest: + pkg.installed: - pkgs: {%- for pkg in postgresql.packages %} - {{ pkg }} diff --git a/states/redis/install.sls b/states/redis/install.sls index c72b997..148fc3e 100644 --- a/states/redis/install.sls +++ b/states/redis/install.sls @@ -1,4 +1,4 @@ --- redis-install: - pkg.latest: + pkg.installed: - name: redis-server diff --git a/states/rsync/install.sls b/states/rsync/install.sls index 752ef61..805d910 100644 --- a/states/rsync/install.sls +++ b/states/rsync/install.sls @@ -1,4 +1,4 @@ --- rsync-install: - pkg.latest: - - name: rsync \ No newline at end of file + pkg.installed: + - name: rsync diff --git a/states/samba/install.sls b/states/samba/install.sls index 342f8a1..a0f6763 100644 --- a/states/samba/install.sls +++ b/states/samba/install.sls @@ -1,7 +1,7 @@ --- {%- from "samba/map.jinja" import samba with context %} samba-pkg: - pkg.latest: + pkg.installed: - pkgs: - samba - samba-common diff --git a/states/time/install.sls b/states/time/install.sls index dc18d3f..6805fba 100644 --- a/states/time/install.sls +++ b/states/time/install.sls @@ -1,5 +1,5 @@ --- {%- from "time/map.jinja" import time with context %} time-pkgs: - pkg.latest: + pkg.installed: - pkgs: {{ time.pkgs }} diff --git a/states/transmission/install.sls b/states/transmission/install.sls index d28cbe9..c0dfb5e 100644 --- a/states/transmission/install.sls +++ b/states/transmission/install.sls @@ -2,8 +2,8 @@ {%- from "transmission/map.jinja" import transmission with context %} transmission-install-server: - pkg.latest: + pkg.installed: - pkgs: - transmission-cli - transmission-common - - transmission-daemon \ No newline at end of file + - transmission-daemon diff --git a/states/vim/install.sls b/states/vim/install.sls index 6c252ee..54d7f72 100644 --- a/states/vim/install.sls +++ b/states/vim/install.sls @@ -1,7 +1,7 @@ --- {%- from "vim/map.jinja" import vim with context %} vim-pkg: - pkg.latest: + pkg.installed: - pkgs: - git - vim @@ -14,4 +14,4 @@ vim-vimfiles-directory: vim-colors-directory: file.directory: - name: {{ vim.colors_dir }} - - makedirs: true \ No newline at end of file + - makedirs: true