From f1c498e639880213361073448a8bf811094bea69 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 25 Jul 2018 20:57:35 +0000 Subject: [PATCH 1/2] add vpn to apache config for vpn --- roles/nextcloud/templates/nextcloud.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2 index 965973ad4..33ec8e2fa 100644 --- a/roles/nextcloud/templates/nextcloud.conf.j2 +++ b/roles/nextcloud/templates/nextcloud.conf.j2 @@ -6,7 +6,7 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud # Apache 2.4 Require host localhost - Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} + Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255/255/255/0 # Apache 2.2 From 230a0c29325e384decd9a62933668ae3fb52a5a7 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 25 Jul 2018 21:08:00 +0000 Subject: [PATCH 2/2] put vpn server addr in default_vars --- roles/nextcloud/templates/nextcloud.conf.j2 | 2 +- vars/default_vars.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2 index 33ec8e2fa..7a24d512f 100644 --- a/roles/nextcloud/templates/nextcloud.conf.j2 +++ b/roles/nextcloud/templates/nextcloud.conf.j2 @@ -6,7 +6,7 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud # Apache 2.4 Require host localhost - Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255/255/255/0 + Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255.255.255.0 # Apache 2.2 diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 8f097e95a..76df8d252 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -188,6 +188,7 @@ sshd_enabled: True # OpenVPN vpn_presence: xscenet.net openvpn_server_port: 1194 +openvpn_server_virtual_ip: 10.8.0.1 openvpn_cron_enabled: False openvpn_install: True openvpn_enabled: False