From 38580a37d1ecadffa4ec15fb27fcdc1e28f5be2e Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Sun, 23 Aug 2015 18:59:09 +0200
Subject: fix bprate, fix pkgs for f22, fix selinux module deployment

---
 roles/clients/tasks/pkgs.yml  | 3 ---
 roles/torrelay/tasks/main.yml | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'roles')

diff --git a/roles/clients/tasks/pkgs.yml b/roles/clients/tasks/pkgs.yml
index 6786c23..222630e 100644
--- a/roles/clients/tasks/pkgs.yml
+++ b/roles/clients/tasks/pkgs.yml
@@ -76,14 +76,12 @@
     - vidalia
     - geany-plugins-addons
     - geany-plugins-geniuspaste
-    - gnome-schedule
     - gshutdown
     - aspell-fr
     - gimp-help-fr
     - hunspell-fr
     - libreoffice-langpack-fr
     - poezio
-    - realcrypt
     - argus
     - dnsenum
     - dsniff
@@ -110,7 +108,6 @@
     - tcpjunk
     - tcpxtract
     - unicornscan
-    - xprobe2
     - yersinia
     - afftools
     - dc3dd
diff --git a/roles/torrelay/tasks/main.yml b/roles/torrelay/tasks/main.yml
index 0dc4e4a..cd66d27 100644
--- a/roles/torrelay/tasks/main.yml
+++ b/roles/torrelay/tasks/main.yml
@@ -39,10 +39,10 @@
     - [ 'true', 'false' ]
   when: ansible_distribution == "Fedora" and is_public is defined
 
-- name: Activation et démarrage du relai Tor
-  service: name=tor state=started enabled=yes
-
 - name: Déploiement du module SELinux pour hidden_services
   copy: src=tor-selinux-f22-policy-module.pp dest=/root/tor-selinux-f22-policy-module.pp
         mode=644
-  when: ansible_distribution_version|int == 22
+  when: ansible_distribution == "Fedora"
+
+- name: Activation et démarrage du relai Tor
+  service: name=tor state=started enabled=yes
-- 
cgit