Remove the role "vpnnode"

9 files changed, 2 insertions, 78 deletions

diff --git a/bin/crtkey-gen.sh b/bin/crtkey-gen.sh
index 79ba30a..094054f 100755
--- a/bin/crtkey-gen.sh
+++ b/bin/crtkey-gen.sh
@@ -6,7 +6,7 @@ SERIAL="48"  # crtversion
 
 SERVERHOST=""
 CLIENTHOST="$SERVERHOST sd-126263.dbjabber sd-128718.nfs sd-128718.bosh sd-128718.ws sd-128718.matrix sd-128718.dbcirrus sd-128718.dblinks sd-128718.redis"
-SERVICELIST="manchester.nfs blackbird.ejabberd blackbird.dbjabber blackbird.dbcirrus blackbird.dblinks blackbird.postfix blackbird.dovecot blackbird.murmur blackbird.ws blackbird.bosh blackbird.redis 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 blackbird.nfs"
+SERVICELIST="manchester.nfs blackbird.ejabberd blackbird.dbjabber blackbird.dbcirrus blackbird.dblinks blackbird.postfix blackbird.dovecot blackbird.murmur blackbird.ws blackbird.bosh blackbird.redis sd-94125.postfix sd-94125.dovecot sd-126263.ejabberd sd-126263.nfs sd-126263.murmur sd-126263.ws sd-126263.bosh sd-126263.redis blackbird.nfs"
 
 JABBERHOST="blackbird.ejabberd sd-126263.ejabberd"
 
diff --git a/bin/crtversion-serial.sh b/bin/crtversion-serial.sh
index 9e563d4..2e2900b 100755
--- a/bin/crtversion-serial.sh
+++ b/bin/crtversion-serial.sh
@@ -7,7 +7,7 @@
 # As a result, we need to edit manually variable files in the playbook, and the
 # script file.
 #
-for i in  roles/dnsserver/vars/main.yml roles/voipserver/vars/main.yml roles/phpworker/vars/main.yml roles/imserver/vars/main.yml roles/nfsserver/vars/main.yml roles/dbserver/vars/main.yml roles/dbreplication/vars/main.yml roles/mtaserver/vars/main.yml roles/reverseproxy/vars/main.yml roles/vpnnode/vars/main.yml
+for i in  roles/dnsserver/vars/main.yml roles/voipserver/vars/main.yml roles/phpworker/vars/main.yml roles/imserver/vars/main.yml roles/nfsserver/vars/main.yml roles/dbserver/vars/main.yml roles/dbreplication/vars/main.yml roles/mtaserver/vars/main.yml roles/reverseproxy/vars/main.yml
 do
     sed -i 's|crtversion: "47"|crtversion: "48"|' $i
 done
diff --git a/openssl/config-server/casperlefantom.net.sd-94125.vpn-openssl.cnf b/openssl/config-server/casperlefantom.net.sd-94125.vpn-openssl.cnf
deleted file mode 100644
index 6cb6be8..0000000
--- a/openssl/config-server/casperlefantom.net.sd-94125.vpn-openssl.cnf
+++ /dev/null
@@ -1,40 +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=NL
-
-# State or Province Name (full name)
-ST=Netherlands
-
-# Locality Name (eg. city)
-L=Amsterdam
-
-# Organization (eg. company)
-O=casperlefantom.net
-
-# Organizational Unit Name (eg. section)
-OU=VPN
-
-# Common Name (*.example.com is also possible)
-CN=163.172.211.128
-
-# E-mail contact
-emailAddress=hostmaster@casperlefantom.net
-
-[ v3_req ]
-subjectAltName = @alt_names
-
-[alt_names]
-IP.1 = 163.172.211.128
-DNS.1 = vpn.casperlefantom.net
-DNS.2 = gw1.vpn.casperlefantom.net
-DNS.3 = 3g.vpn.casperlefantom.net
-DNS.4 = 4g.vpn.casperlefantom.net
-DNS.5 = 5g.vpn.casperlefantom.net
diff --git a/roles/vpnnode/files/certs b/roles/vpnnode/files/certs
deleted file mode 120000
index 003911f..0000000
--- a/roles/vpnnode/files/certs
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../media/lv1/.certs
\ No newline at end of file
diff --git a/roles/vpnnode/tasks/crt.yml b/roles/vpnnode/tasks/crt.yml
deleted file mode 100644
index ebdadbe..0000000
--- a/roles/vpnnode/tasks/crt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- name: Installation des fichiers certificat pour openvpn
-  copy:
-    src: "certs/{{ maindomain }}.{{ ansible_hostname }}.vpn.{{ crtversion }}.crt"
-    dest: /etc/pki/tls/certs/{{ maindomain }}.vpn.crt
-    owner: root
-    group: root
-    mode: 0644
-  tags: keys
-
-- name: Installation du fichier dhparam pour openvpn
-  copy:
-    src: "certs/dhparam-4096.{{ ansible_hostname }}.{{ crtversion }}.pem"
-    dest: /etc/pki/tls/certs/dhparam-4096.{{ ansible_hostname }}.vpn.pem
-    owner: root
-    group: root
-    mode: 0644
-  tags: keys
-
-- name: Installation de la clé pour openvpn
-  copy:
-    src: "certs/{{ maindomain }}.{{ ansible_hostname }}.vpn.{{ crtversion }}.key"
-    dest: /etc/pki/tls/private/{{ maindomain }}.vpn.key
-    owner: root
-    group: openvpn
-    mode: 0440
-  tags: keys
diff --git a/roles/vpnnode/tasks/main.yml b/roles/vpnnode/tasks/main.yml
deleted file mode 100644
index a61319c..0000000
--- a/roles/vpnnode/tasks/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-- import_tasks: crt.yml
diff --git a/roles/vpnnode/vars/main.yml b/roles/vpnnode/vars/main.yml
deleted file mode 100644
index c9d9fc9..0000000
--- a/roles/vpnnode/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-maindomain: casperlefantom.net
-crtversion: "48"
diff --git a/site.yml b/site.yml
index e83da1c..75bc9ea 100644
--- a/site.yml
+++ b/site.yml
@@ -18,5 +18,4 @@
 - import_playbook: dbreplication.yml
 - import_playbook: phpworker.yml
 - import_playbook: reverseproxy.yml
-- import_playbook: vpnnode.yml
 - import_playbook: clients.yml
diff --git a/vpnnode.yml b/vpnnode.yml
deleted file mode 100644
index 6d09a89..0000000
--- a/vpnnode.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- hosts: vpn
-  remote_user: root
-  any_errors_fatal: true
-  roles:
-    - vpnnode