From 56e60c0a281937ff9dc0124768eaa8ecd5e61a70 Mon Sep 17 00:00:00 2001
From: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Date: Tue, 15 Dec 2020 21:13:41 +0100
Subject: [PATCH] Fix issue
---
roles/inspircd/tasks/config.yml | 4 ----
roles/inspircd/templates/etc/inspircd/inspircd.conf.2 | 4 ----
2 files changed, 8 deletions(-)
diff --git a/roles/inspircd/tasks/config.yml b/roles/inspircd/tasks/config.yml
index 5f48166..dfc865f 100644
--- a/roles/inspircd/tasks/config.yml
+++ b/roles/inspircd/tasks/config.yml
@@ -1,9 +1,5 @@
---
-- name: generate /etc/inspircd/spanningtree.pw
- set_fact:
- inspircd_link_sendpass: "{{ lookup('password', '/etc/inspircd/spanningtree.pw') }}"
-
- name: render /etc/inspircd/inspircd.conf
template:
src: etc/inspircd/inspircd.conf.2
diff --git a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2 b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
index ec7c05d..a67e9a2 100644
--- a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
+++ b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
@@ -93,11 +93,7 @@
ipaddr="{{ link.ipaddr }}"
allowmask="{{ link.allowcidr | join(' ') }}"
sendpass="{{ inspircd_link_sendpass }}"
- {% if link.recvpass is defined %}
recvpass="{{ link.recvpass }}"
- {% else %}
- recvpass="{{ hostvars[link.ansible_inventory_name|default(name)].inspircd_link_sendpass }}"
- {% endif %}
{% if 'bind' in link %}bind="{{ link.bind }}"{% endif %}
{% if 'fingerprint' in link %}fingerprint="{{ link.fingerprint }}"{% endif %}
{% if 'hidden' in link %}hidden="{{ link.hidden | ternary('yes', 'no') }}"{% endif %}