diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2015-01-31 01:41:49 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2015-01-31 01:41:49 +0100 |
| commit | 1e64044d9568df2f10e3a7966737305a54874c69 (patch) | |
| tree | 209939573c5db81cecb5c8a53cc556b920ab3a5a | |
| parent | e702752e5abb8c92523942ed82461946b269c233 (diff) | |
| download | playbooks-ansible-1e64044d9568df2f10e3a7966737305a54874c69.tar.gz playbooks-ansible-1e64044d9568df2f10e3a7966737305a54874c69.tar.xz playbooks-ansible-1e64044d9568df2f10e3a7966737305a54874c69.zip | |
Update inventory file
Add seeks configuration for Tor router
Fix number of installed kernel in yum config
Disable deltarpm on virtual machines
| -rw-r--r-- | host_vars/lancaster.casperlefantom.net | 1 | ||||
| -rw-r--r-- | hosts | 1 | ||||
| -rw-r--r-- | roles/common/tasks/yum.yml | 5 | ||||
| -rw-r--r-- | roles/torrelay/templates/torrc.j2 | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/host_vars/lancaster.casperlefantom.net b/host_vars/lancaster.casperlefantom.net index b1e3bdd..ca967c9 100644 --- a/host_vars/lancaster.casperlefantom.net +++ b/host_vars/lancaster.casperlefantom.net @@ -4,3 +4,4 @@ bpburst: 60 is_public: true is_mail: true is_jabber: true +is_seeks: true @@ -14,7 +14,6 @@ vm03.casperlefantom.net [dns] lancaster.casperlefantom.net ns2.casperlefantom.net -vm02.casperlefantom.net mosquito.casperlefantom.net ns3.casperlefantom.net diff --git a/roles/common/tasks/yum.yml b/roles/common/tasks/yum.yml index f4c10f2..390c567 100644 --- a/roles/common/tasks/yum.yml +++ b/roles/common/tasks/yum.yml @@ -17,17 +17,18 @@ value=0 when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" + or ansible_virtualization_role == "guest" - name: Nombre mini de noyaux installés ini_file: dest=/etc/yum.conf section=main option=installonly_limit value={{ minkernel }} - when: ansible_default_ipv6.address == "2a00:c70:1:178:170:111:194:c0de" + when: ansible_virtualization_role == "guest" - name: Nombre maxi de noyaux installés ini_file: dest=/etc/yum.conf section=main option=installonly_limit value={{ maxkernel }} - when: ansible_default_ipv6.address != "2a00:c70:1:178:170:111:194:c0de" + when: ansible_virtualization_role != "guest" diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index c45af50..c42d471 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -28,6 +28,11 @@ HiddenServicePort 5222 127.0.0.1:5222 {% if is_bitcoin is defined %} HiddenServicePort 8333 127.0.0.1:8333 {% endif %} +{% if is_seeks is defined %} +HiddenServiceDir /var/lib/tor/hidden_service2/ +HiddenServicePort 80 127.0.0.1:80 +HiddenServicePort 443 127.0.0.1:443 +{% endif %} {% if is_public is defined %} ORPort {{ orport }} {% if tor_address is defined %} |