Integrating basic/non_container_pkgs.sls, Adding host be.nexunus

diff --git a/basic/localization.sls b/basic/localization.sls
index 4d9ff6b2595ebbd9fb48e804d41c7f76298cc4d4..171b84b7dc106580d0853e1a06282aad6f203684 100644 (file)
--- a/basic/localization.sls
+++ b/basic/localization.sls
@@ -47,7 +47,7 @@ default_locale:
     locale.system:
         - name: de_DE.UTF-8
 
-timezone:
-    timezone.system:
-        - name: {{ salt['pillar.get']('timezone', 'Europe/Berlin') }}
+#timezone:
+#    timezone.system:
+#        - name: {{ salt['pillar.get']('timezone', 'Europe/Berlin') }}
 

diff --git a/basic/pkgs.sls b/basic/pkgs.sls
index 5a4d38f160567c4ce55b13ffa450ff5402370b46..146d15534b828692357855685c33d6feec3abc23 100644 (file)
--- a/basic/pkgs.sls
+++ b/basic/pkgs.sls
@@ -3,7 +3,7 @@ common-pkgs:
     - pkgs:
       - ack-grep
       - acl
-      - apticron
+      # - apticron
       - aptitude
       - bash-completion
       - bc
@@ -16,7 +16,7 @@ common-pkgs:
       - console-setup
       - dc
       - debconf
-      - dmsetup
+      # - dmsetup
       - dnsutils
       - figlet
       - file
@@ -25,24 +25,24 @@ common-pkgs:
       - git
       - git-email
       - gzip
-      - haveged
+      # - haveged
       - iso-codes
       - isoquery
       - less
       - lsb-base
       - lsb-release
       - lsof
-      - lvm2
+      # - lvm2
       - make
-      - mlocate
+      # - mlocate
       - openssl-blacklist
-      - parted
+      # - parted
       - patch
       - psmisc
       - rsync
       - time
       - traceroute
-      - usbutils
+      # - usbutils
       - util-linux
       - wget
       - whois

diff --git a/top.sls b/top.sls
index 2d7f711aff318145b62f9ccd57c964ebf011549d..ab78a4ea46c6e786224ac98ed5192da3fef6328b 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -8,6 +8,7 @@ base:
     - debian.sysvinit
     - basic.logrotate
     - basic.pkgs
+    - basic.non_container_pkgs
     - basic.chrony
     - basic.rsyslog
     - basic.shells
@@ -18,18 +19,21 @@ base:
     - fail2ban
     - bind
 
-  'liz.nexunus.net':
+  '.*.nexunus.net':
+    - match: pcre
     - debian.apt
     - basic.resolver
     - basic.editors
     - basic.localization
-    - debian.sysvinit
     - basic.logrotate
     - basic.pkgs
-    - basic.chrony
     - basic.rsyslog
     - basic.shells
     - basic.skel
     - basic.root
     - utils.root
 
+  'liz.nexunus.net':
+    - basic.chrony
+    - basic.non_container_pkgs
+