diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2 index 89858bdb8..0f2aee4f6 100644 --- a/roles/nextcloud/templates/nextcloud.conf.j2 +++ b/roles/nextcloud/templates/nextcloud.conf.j2 @@ -16,17 +16,17 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud # 2019-09-04 commenting out towards future removal #Require host localhost -#{% if CONDITION %} {# where CONDITION was nextcloud_allow_public_ips #} -# # PERMIT ACCESS FROM ALL IPv4 ADDRESSES: +{% if True %} {# 2020-02-15: Condition WAS... nextcloud_allow_public_ips #} + # PERMIT ACCESS FROM ALL IPv4 ADDRESSES: Require all granted -# # PERMIT ACCESS FROM THESE IPv4 ADDRESS RANGES ONLY: -# #Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} 192.168 10 -#{% else %} -# # PERMIT ACCESS FROM ALL IPv4 ADDRESSES: -# #Require all granted -# # PERMIT ACCESS FROM THESE IPv4 ADDRESS RANGES ONLY: -# Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} 192.168 10 -#{% endif %} + # PERMIT ACCESS FROM THESE IPv4 ADDRESS RANGES ONLY: + #Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} 192.168 10 +{% else %} + # PERMIT ACCESS FROM ALL IPv4 ADDRESSES: + #Require all granted + # PERMIT ACCESS FROM THESE IPv4 ADDRESS RANGES ONLY: + Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} 192.168 10 +{% endif %} {# Reminder that {{ lan_ip }}/{{ lan_netmask }} is 172.18.96.1/255.255.224.0 #} # AVOID THIS LINE AS IT OVERLY RESTRICTS SCHOOLS W/ 192.168.1.x, 10.x.y.z: #Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255.255.255.0