summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2022-02-14 07:36:08 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2022-02-14 07:36:08 +0100
commit7d67743aeb490b4ef48f0257bd884877bd7288c3 (patch)
tree8f0d396705f069fce3b2754de1669f2d12709581
parentc13248a33eba7d589dc4fbfb2782205b3e2a95f5 (diff)
downloadplaybooks-ansible-7d67743aeb490b4ef48f0257bd884877bd7288c3.tar.gz
playbooks-ansible-7d67743aeb490b4ef48f0257bd884877bd7288c3.tar.xz
playbooks-ansible-7d67743aeb490b4ef48f0257bd884877bd7288c3.zip
Remove matrix stuff but never deployed
-rwxr-xr-xbin/crtkey-gen.sh2
-rw-r--r--hosts.net3
-rw-r--r--openssl/config-server/casperlefantom.net.blackbird.matrix-openssl.cnf35
3 files changed, 1 insertions, 39 deletions
diff --git a/bin/crtkey-gen.sh b/bin/crtkey-gen.sh
index b0f0a7a..67c44f8 100755
--- a/bin/crtkey-gen.sh
+++ b/bin/crtkey-gen.sh
@@ -6,7 +6,7 @@ SERIAL="23" # crtversion
SERVERHOST=""
CLIENTHOST="$SERVERHOST sd-126263.dbjabber sd-126263.dbcirrus sd-128718.nfs sd-128718.bosh sd-128718.ws sd-128718.php prattandwhitney.dbcirrus prattandwhitney.nfs prattandwhitney.redis packardmerlin.dbcirrus packardmerlin.nfs packardmerlin.redis"
-SERVICELIST="manchester.nfs blackbird.ejabberd blackbird.dbjabber blackbird.dbcirrus blackbird.postfix blackbird.dovecot blackbird.murmur blackbird.ws blackbird.bosh blackbird.redis blackbird.matrix blackbird.kvm sd-94125.postfix sd-94125.dovecot sd-94125.vpn sd-126263.ejabberd sd-126263.nfs sd-126263.murmur sd-126263.ws sd-126263.bosh sd-126263.redis vulcain.nfs blackbird.nfs blackbird.squid prattandwhitney.php packardmerlin.php"
+SERVICELIST="manchester.nfs blackbird.ejabberd blackbird.dbjabber blackbird.dbcirrus blackbird.postfix blackbird.dovecot blackbird.murmur blackbird.ws blackbird.bosh blackbird.redis blackbird.kvm sd-94125.postfix sd-94125.dovecot sd-94125.vpn sd-126263.ejabberd sd-126263.nfs sd-126263.murmur sd-126263.ws sd-126263.bosh sd-126263.redis vulcain.nfs blackbird.nfs blackbird.squid prattandwhitney.php packardmerlin.php"
SERVERCONFDIR="$HOME/park-admin/playbooks-ansible/openssl/config-server/"
CLIENTCONFDIR="$HOME/park-admin/playbooks-ansible/openssl/config-client/"
diff --git a/hosts.net b/hosts.net
index 620c184..5cecad5 100644
--- a/hosts.net
+++ b/hosts.net
@@ -37,9 +37,6 @@ nsb.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
[kvm:children]
proxy
-[matrix:children]
-proxy
-
[voip:children]
jabber
diff --git a/openssl/config-server/casperlefantom.net.blackbird.matrix-openssl.cnf b/openssl/config-server/casperlefantom.net.blackbird.matrix-openssl.cnf
deleted file mode 100644
index fad9813..0000000
--- a/openssl/config-server/casperlefantom.net.blackbird.matrix-openssl.cnf
+++ /dev/null
@@ -1,35 +0,0 @@
-[ req ]
-default_bits = 4096
-default_md = sha256
-encrypt_key = no
-distinguished_name = req_dn
-req_extensions = v3_req
-prompt = no
-
-[ req_dn ]
-# country (2 letter code)
-C=FR
-
-# State or Province Name (full name)
-ST=Basse-Normandie
-
-# Locality Name (eg. city)
-L=Caen
-
-# Organization (eg. company)
-O=casperlefantom.net
-
-# Organizational Unit Name (eg. section)
-OU=Matrix
-
-# Common Name (*.example.com is also possible)
-CN=matrix.casperlefantom.net
-
-# E-mail contact
-emailAddress=hostmaster@casperlefantom.net
-
-[ v3_req ]
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = matrix.casperlefantom.net