Page MenuHomeDevCentral
Files F3766872

D1749.diff
No OneTemporary
Actions

D1749.diff
View Options

diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
--- a/roles/core/userland-software/init.sls
+++ b/roles/core/userland-software/init.sls
@@ -26,8 +26,7 @@
# -------------------------------------------------------------
shells:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bash
- zsh
diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
--- a/roles/devserver/userland-software/dev.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -13,8 +13,7 @@
# -------------------------------------------------------------
devserver_software_dev_c:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.boost }}
- cmocka
@@ -25,8 +24,7 @@
# -------------------------------------------------------------
devserver_software_dev_java:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- openjdk8
- apache-ant
@@ -37,8 +35,7 @@
# -------------------------------------------------------------
devserver_software_dev_dotnet:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- mono
@@ -47,8 +44,7 @@
# -------------------------------------------------------------
devserver_software_dev_node:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.node }}
- npm
@@ -70,8 +66,7 @@
# -------------------------------------------------------------
devserver_software_dev_php:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.phpunit }}
@@ -80,8 +75,7 @@
# -------------------------------------------------------------
devserver_software_dev_python:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# Modern Python 3 packages
- {{ packages_prefixes.python3 }}beautifulsoup
@@ -96,8 +90,7 @@
# -------------------------------------------------------------
devserver_software_dev_ruby:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages_prefixes.rubygem }}rubocop
@@ -106,8 +99,7 @@
# -------------------------------------------------------------
devserver_software_dev_rust:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- rust
@@ -116,8 +108,7 @@
# -------------------------------------------------------------
devserver_software_dev_shell:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- hs-ShellCheck
@@ -126,8 +117,7 @@
# -------------------------------------------------------------
devserver_software_dev_tcl:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- rlwrap
- tcllib
@@ -140,8 +130,7 @@
# -------------------------------------------------------------
devserver_software_dev_web:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- memcached
- phantomjs
@@ -153,7 +142,6 @@
# -------------------------------------------------------------
devserver_software_dev_misctools:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- git-review
diff --git a/roles/devserver/userland-software/misc.sls b/roles/devserver/userland-software/misc.sls
--- a/roles/devserver/userland-software/misc.sls
+++ b/roles/devserver/userland-software/misc.sls
@@ -9,8 +9,7 @@
{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
devserver_software_misc_vcs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# VCS
- cvs
@@ -21,8 +20,7 @@
- {{ packages_prefixes.python2 }}hg-git
devserver_software_misc_media:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- ffmpeg2theora
- opencore-amr
@@ -32,24 +30,21 @@
- x265
devserver_software_misc_text_processing:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- antiword
- odt2txt
- texlive-full
devserver_software_misc_security:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- aescrypt
- pwgen
- vault
devserver_software_misc_tools:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- boxes
- cursive
@@ -65,8 +60,7 @@
{% if grains['os'] == 'FreeBSD' %}
devserver_software_misc_ports:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- ccache
- portmaster
@@ -104,15 +98,13 @@
{% endif %}
devserver_software_misc_p2p:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- transmission-daemon
- transmission-web
devserver_software_misc_gadgets:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- asciiquarium
- binclock
@@ -121,15 +113,13 @@
- weatherspect
devserver_software_misc_games:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bsdgames
- textmaze
devserver_software_misc_network:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- getdns
- iftop
diff --git a/roles/mailserver/dkim/init.sls b/roles/mailserver/dkim/init.sls
--- a/roles/mailserver/dkim/init.sls
+++ b/roles/mailserver/dkim/init.sls
@@ -33,8 +33,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
opendkim_software:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- opendkim
{% if grains['os_family'] == 'Debian' %}
diff --git a/roles/paas-lxc/lxc/init.sls b/roles/paas-lxc/lxc/init.sls
--- a/roles/paas-lxc/lxc/init.sls
+++ b/roles/paas-lxc/lxc/init.sls
@@ -11,8 +11,7 @@
# -------------------------------------------------------------
lxc_packages:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- lxc
{% if grains['os_family'] == 'RedHat' %}
diff --git a/roles/shellserver/database/mysql.sls b/roles/shellserver/database/mysql.sls
--- a/roles/shellserver/database/mysql.sls
+++ b/roles/shellserver/database/mysql.sls
@@ -13,8 +13,7 @@
# -------------------------------------------------------------
mysql:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.mariadb }}
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -17,8 +17,7 @@
# -------------------------------------------------------------
editors:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- vim
- nano
@@ -30,8 +29,7 @@
# -------------------------------------------------------------
utilities:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- mosh
- cmatrix
@@ -64,8 +62,7 @@
{% endif %}
utilities_www:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- links
- w3m
@@ -76,8 +73,7 @@
# -------------------------------------------------------------
userland_software_shells:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- fish
@@ -86,8 +82,7 @@
# -------------------------------------------------------------
dev:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- autoconf
- automake
@@ -110,8 +105,7 @@
{% if grains['os_family'] == 'Debian' %}
dev_popular_libs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- libssl-dev
{% endif %}
@@ -133,8 +127,7 @@
{% endif %}
languages:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- python3
- {{ packages.tcl }}
@@ -149,8 +142,7 @@
# -------------------------------------------------------------
languages_libs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# PHP extensions
- {{ packages_prefixes.php }}bcmath
@@ -255,8 +247,7 @@
# -------------------------------------------------------------
spelling:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.verbiste }}
- {{ packages['aspell-fr'] }}
@@ -267,8 +258,7 @@
# -------------------------------------------------------------
media:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.exiftool }}
- id3v2
diff --git a/roles/shellserver/userland-software/irc.sls b/roles/shellserver/userland-software/irc.sls
--- a/roles/shellserver/userland-software/irc.sls
+++ b/roles/shellserver/userland-software/irc.sls
@@ -13,8 +13,7 @@
# -------------------------------------------------------------
irc_clients:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- irssi
- irssi-scripts
@@ -29,8 +28,7 @@
# -------------------------------------------------------------
irc_bouncers:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- znc
@@ -49,8 +47,7 @@
# -------------------------------------------------------------
irc_misc:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bitlbee
- oidentd

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 20:12 (18 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258895
Default Alt Text
D1749.diff (8 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator