Merge pull request #323 from HiSPARC/remove-vpn

Remove VPN
HiSPARC · Mar 25, 2024 · cccb65a · cccb65a
2 parents 1fe1492 + 2047a07
commit cccb65a
Show file tree

Hide file tree

Showing 81 changed files with 15 additions and 4,224 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,16 +30,6 @@ services:
     depends_on:
       - postgres
 
-  vpn:
-     image: 'python:3.10'
-     restart: unless-stopped
-     volumes:
-       - './scripts:/base:ro'
-     ports:
-       - '8001:8001'
-     working_dir: '/base'
-     command: 'python fake-vpn-xmlrpc-server.py'
-
   datastore:
      image: 'python:3.10'
      restart: unless-stopped

diff --git a/provisioning/group_vars/all.yml b/provisioning/group_vars/all.yml
@@ -5,7 +5,5 @@ hisparc_path: /uufs/chpc.utah.edu/common/home/hisparc
 publicdb_host: hisparc-data.chpc.utah.edu
 datastore_host: hisparc-raw.chpc.utah.edu
 datastore_port: 8001
-vpn_host:
-vpn_port:
 
 datastore_data_path: "{{ hisparc_path }}/data/datastore"
diff --git a/provisioning/host_vars/publicdb/main.yml b/provisioning/host_vars/publicdb/main.yml
@@ -10,8 +10,6 @@ publicdb_repo: https://github.com/HiSPARC/publicdb.git
 psql_database_name: publicdb
 psql_user: "{{ ansible_user }}"
 
-# vpn_proxy: "http://{{ vpn_host }}:{{ vpn_port }}"
-vpn_proxy:
 datastore_proxy: "http://{{ datastore_host }}:{{ datastore_port }}"
 
 email_backend: django.core.mail.backends.smtp.EmailBackend

diff --git a/provisioning/host_vars/vpn/main.yml b/provisioning/host_vars/vpn/main.yml
diff --git a/provisioning/host_vars/vpn/vault.yml b/provisioning/host_vars/vpn/vault.yml
diff --git a/provisioning/hosts.yml b/provisioning/hosts.yml
@@ -1,5 +1,4 @@
 all:
   hosts:
     publicdb:
-    vpn:
     datastore:
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
@@ -1,7 +1,6 @@
-- name: Setup firewall and development tools are installed
+- name: Setup prepare Python environment
   hosts: publicdb:datastore
   roles:
-    # - simple-firewall
     - development
 
 - name: Setup bashrc on shared user account
@@ -19,20 +18,7 @@
   hosts: datastore
   roles:
     - datastore
+
 # Datastore Firewall (nftables)
 # HiSPARC datastore configuration server
 # ip saddr hisparc-data tcp dport { 8001 } accept
-
-# - name: Setup network config for tietar
-#   hosts: tietar.nikhef.nl
-#   roles:
-#     - network-tietar
-
-# - name: Setup VPN server
-#   hosts: vpn_group
-#   roles:
-#     - dos
-#     - postfix
-#     - shorewall-firewall
-#     - openvpn
-#     - vpn-scripts
diff --git a/provisioning/roles/dos/handlers/main.yml b/provisioning/roles/dos/handlers/main.yml
diff --git a/provisioning/roles/dos/tasks/main.yml b/provisioning/roles/dos/tasks/main.yml
diff --git a/provisioning/roles/network-tietar/handlers/main.yml b/provisioning/roles/network-tietar/handlers/main.yml
diff --git a/provisioning/roles/network-tietar/tasks/main.yml b/provisioning/roles/network-tietar/tasks/main.yml