From 98b1885dc3453e66f5e3f4e2987947f6d6746590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan@fedx230.ivanclement.maison>
Date: Sat, 23 Mar 2019 18:57:28 +0100
Subject: [PATCH] Tou d'aplomb pour tlp

---
 softwares/tlp.sls         | 15 +++++++++++++--
 softwares/userstation.sls |  3 ++-
 softwares/workstation.sls |  5 ++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/softwares/tlp.sls b/softwares/tlp.sls
index 8dac5e1..b87822d 100644
--- a/softwares/tlp.sls
+++ b/softwares/tlp.sls
@@ -1,6 +1,7 @@
 # A implémenter
 # https://www.unixsysadmin.com/fedora-on-a-thinkpad-p1/
-
+{% if grains['kernel'] == 'Linux' %}
+  {% if grains['virtual'] == 'physical' %}
 Installons tlp:
   pkg.installed:
     - pkgs:
@@ -9,4 +10,14 @@ Installons tlp:
 
 tlp:
   service.running:
-    - enable: True
\ No newline at end of file
+    - enable: True
+   
+  {%else %}
+Supprimons tlp:
+  pkg.removed:
+    - pkgs:
+      - tlp
+      - tlp-rdw
+
+  {%endif%}
+{%endif%}
\ No newline at end of file
diff --git a/softwares/userstation.sls b/softwares/userstation.sls
index cca4475..572e071 100644
--- a/softwares/userstation.sls
+++ b/softwares/userstation.sls
@@ -3,12 +3,13 @@ include:
 #  - linux.update
   - linux.VMSwappiness
   - linux.MesPaquets
-#  - linux.SSHPubKeys
+  - linux.SSHPubKeys
   - softwares.chrome
   - softwares.vlc
   - softwares.multimedia
   - softwares.teamviewer
   - softwares.nextcloud-client
+  - softwares.tlp
 
 Installons les logiciels:
   pkg.installed:
diff --git a/softwares/workstation.sls b/softwares/workstation.sls
index 9d7d0ab..66d9c08 100644
--- a/softwares/workstation.sls
+++ b/softwares/workstation.sls
@@ -2,12 +2,11 @@
 include:
 #  - linux.update
   - softwares.userstation
-  - linux.SSHPubKeys
+#  - linux.SSHPubKeys
   - softwares.atom
   - softwares.VisualStudioCode
   - softwares.VirtualBox
-  - softwares.tlp
-
+  
 'Installons les logiciels pour Exchange':
   pkg.installed:
     - pkgs: