From 051f5387dca3c4ed671e058c0bd4b74eaf9f77e0 Mon Sep 17 00:00:00 2001 From: tim-moody Date: Fri, 20 Jul 2018 22:33:54 -0400 Subject: [PATCH 01/16] add concurrency to make kiwix lib --- roles/kiwix/templates/iiab-make-kiwix-lib | 25 ++++++++++++++++---- roles/kiwix/templates/iiab-make-kiwix-lib.py | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib b/roles/kiwix/templates/iiab-make-kiwix-lib index ae06bc0cd..a7d2b7818 100644 --- a/roles/kiwix/templates/iiab-make-kiwix-lib +++ b/roles/kiwix/templates/iiab-make-kiwix-lib @@ -1,8 +1,25 @@ #!/bin/bash -{{ systemctl_program }} stop kiwix-serve -/usr/bin/iiab-make-kiwix-lib.py -#/usr/bin/iiab-make-apache-config.py -{{ systemctl_program }} start kiwix-serve +LOCK_PATH=/run/lock/kiwix +WAITLOCK="$LOCK_PATH/make-kiwix-lib-wait.LCK"; +RUNLOCK=WAITLOCK="$LOCK_PATH/make-kiwix-lib-run.LCK"; +exec 200>$WAITLOCK; +exec 201>$RUNLOCK; +if flock -n -e 200; then : + echo 'Waiting to run iiab-make-kiwix-lib.py' + # wait for up to 5 min + flock -x -w 300 201 + echo "Now running iiab-make-kiwix-lib.py" + # write to {{ kiwix_library_xml }}.tmp to minimize kiwix down + # zim map could be out of sync for a few seconds + /usr/bin/iiab-make-kiwix-lib.py + {{ systemctl_program }} stop kiwix-serve + rm {{ kiwix_library_xml }} + mv {{ kiwix_library_xml }}.tmp {{ kiwix_library_xml }} + {{ systemctl_program }} start kiwix-serve +else + echo "Can't get wait lock for iiab-make-kiwix-lib.py"; + exit 1; +fi exit 0 diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib.py b/roles/kiwix/templates/iiab-make-kiwix-lib.py index 40f45cb82..6a06728dc 100644 --- a/roles/kiwix/templates/iiab-make-kiwix-lib.py +++ b/roles/kiwix/templates/iiab-make-kiwix-lib.py @@ -30,7 +30,7 @@ iiab_config_file = "{{ iiab_config_file }}" # Variables that should be read from config file # All of these variables will be read from config files and recomputed in init() iiab_zim_path = "{{ iiab_zim_path }}" -kiwix_library_xml = "{{ kiwix_library_xml }}" +kiwix_library_xml = "{{ kiwix_library_xml }}.tmp" iiab_base_path = "{{ iiab_base }}" kiwix_manage = iiab_base_path + "/kiwix/bin/kiwix-manage" From 6c88827fe65276c239e7d2c3e769fe46e9c31714 Mon Sep 17 00:00:00 2001 From: tim-moody Date: Mon, 23 Jul 2018 15:18:31 -0400 Subject: [PATCH 02/16] fixes after testing --- roles/kiwix/templates/iiab-make-kiwix-lib | 55 +++++++++++--------- roles/kiwix/templates/iiab-make-kiwix-lib.py | 9 ++-- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib b/roles/kiwix/templates/iiab-make-kiwix-lib index a7d2b7818..5680470f3 100644 --- a/roles/kiwix/templates/iiab-make-kiwix-lib +++ b/roles/kiwix/templates/iiab-make-kiwix-lib @@ -1,25 +1,30 @@ -#!/bin/bash - -LOCK_PATH=/run/lock/kiwix -WAITLOCK="$LOCK_PATH/make-kiwix-lib-wait.LCK"; -RUNLOCK=WAITLOCK="$LOCK_PATH/make-kiwix-lib-run.LCK"; -exec 200>$WAITLOCK; -exec 201>$RUNLOCK; - -if flock -n -e 200; then : - echo 'Waiting to run iiab-make-kiwix-lib.py' - # wait for up to 5 min - flock -x -w 300 201 - echo "Now running iiab-make-kiwix-lib.py" - # write to {{ kiwix_library_xml }}.tmp to minimize kiwix down - # zim map could be out of sync for a few seconds - /usr/bin/iiab-make-kiwix-lib.py - {{ systemctl_program }} stop kiwix-serve - rm {{ kiwix_library_xml }} - mv {{ kiwix_library_xml }}.tmp {{ kiwix_library_xml }} - {{ systemctl_program }} start kiwix-serve -else - echo "Can't get wait lock for iiab-make-kiwix-lib.py"; - exit 1; -fi -exit 0 +#!/bin/bash + +LOCK_PATH=/run/lock/kiwix +mkdir -p $LOCK_PATH + +WAITLOCK="$LOCK_PATH/make-kiwix-lib-wait.LCK"; +RUNLOCK="$LOCK_PATH/kiwix-lib-access.LCK"; +KIWIXLIB={{ kiwix_library_xml }} + +exec 200>$WAITLOCK; +exec 201>$RUNLOCK; + +if flock -n -e 200; then : + echo 'Waiting to run iiab-make-kiwix-lib.py' + # wait for up to 5 min + flock -x -w 300 201 + flock -u 200 # unlock queue + echo "Now running iiab-make-kiwix-lib.py" + # write to {{ kiwix_library_xml }}.tmp to minimize kiwix down + # zim map could be out of sync for a few seconds + /usr/bin/iiab-make-kiwix-lib.py + {{ systemctl_program }} stop kiwix-serve + rm $KIWIXLIB + mv $KIWIXLIB.tmp $KIWIXLIB + {{ systemctl_program }} start kiwix-serve +else + echo "Can't get wait lock for iiab-make-kiwix-lib.py"; + exit 1; +fi +exit 0 diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib.py b/roles/kiwix/templates/iiab-make-kiwix-lib.py index 6a06728dc..d331f194d 100644 --- a/roles/kiwix/templates/iiab-make-kiwix-lib.py +++ b/roles/kiwix/templates/iiab-make-kiwix-lib.py @@ -2,7 +2,7 @@ """ - Creates library.xml file for kiwix from contents of /zims/content and index + Creates temp library.xml file for kiwix from contents of /zims/content and index Author: Tim Moody Contributors: Jerry Vonau @@ -30,7 +30,9 @@ iiab_config_file = "{{ iiab_config_file }}" # Variables that should be read from config file # All of these variables will be read from config files and recomputed in init() iiab_zim_path = "{{ iiab_zim_path }}" -kiwix_library_xml = "{{ kiwix_library_xml }}.tmp" + +# Later we will append .tmp to file name +kiwix_library_xml = "{{ kiwix_library_xml }}" iiab_base_path = "{{ iiab_base }}" kiwix_manage = iiab_base_path + "/kiwix/bin/kiwix-manage" @@ -41,8 +43,9 @@ old_zim_map = {"bad.zim" : "unparseable name"} def main(): """Server routine""" - + global kiwix_library_xml init() + kiwix_library_xml += '.tmp' # write to temp file # remove existing file try: From 59e53938a017ea3e143f234fd44fe4b812223c35 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Mon, 23 Jul 2018 15:51:14 -0400 Subject: [PATCH 03/16] add flock package --- roles/2-common/tasks/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index f64c25936..43b1edffe 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -71,6 +71,7 @@ - pandoc - lynx - ntfs-3g + - flock #- name: Install pip as a commonly required package management system # command: curl https://bootstrap.pypa.io/get-pip.py -o {{ downloads_dir }}/get-pip.py From fa157c22a7cf2022ac0d92eb393bf6cfea86c09a Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Mon, 23 Jul 2018 16:54:09 -0400 Subject: [PATCH 04/16] put flock in kiwix --- roles/2-common/tasks/packages.yml | 1 - roles/kiwix/tasks/kiwix_install.yml | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 43b1edffe..f64c25936 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -71,7 +71,6 @@ - pandoc - lynx - ntfs-3g - - flock #- name: Install pip as a commonly required package management system # command: curl https://bootstrap.pypa.io/get-pip.py -o {{ downloads_dir }}/get-pip.py diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml index 0cb5193b5..d8d75f985 100644 --- a/roles/kiwix/tasks/kiwix_install.yml +++ b/roles/kiwix/tasks/kiwix_install.yml @@ -85,6 +85,13 @@ # 4. CREATE/ENABLE/DISABLE KIWIX SERVICE & ITS CRON JOB +- name: Install packages + package: + name: "{{ item }}" + state: present + with_items: + - flock + - name: Create 'kiwix-serve' service and related files template: backup: no From 8b5e77be1702c899768f29989427e6d05036b1f8 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Mon, 23 Jul 2018 17:14:48 -0400 Subject: [PATCH 05/16] flock is already installed --- roles/kiwix/tasks/kiwix_install.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml index d8d75f985..0cb5193b5 100644 --- a/roles/kiwix/tasks/kiwix_install.yml +++ b/roles/kiwix/tasks/kiwix_install.yml @@ -85,13 +85,6 @@ # 4. CREATE/ENABLE/DISABLE KIWIX SERVICE & ITS CRON JOB -- name: Install packages - package: - name: "{{ item }}" - state: present - with_items: - - flock - - name: Create 'kiwix-serve' service and related files template: backup: no From 7f56f75c2ea5f7431a883b14bcbf95365474c7b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 21:36:05 -0400 Subject: [PATCH 06/16] Rename runansible to runansible.deprecated --- runansible => runansible.deprecated | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename runansible => runansible.deprecated (100%) diff --git a/runansible b/runansible.deprecated similarity index 100% rename from runansible rename to runansible.deprecated From 1eee4efc64d82e6a7a5c3d9b73282b6ff1c4fda7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 21:36:23 -0400 Subject: [PATCH 07/16] Rename runtags to runtags.deprecated --- runtags => runtags.deprecated | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename runtags => runtags.deprecated (100%) diff --git a/runtags b/runtags.deprecated similarity index 100% rename from runtags rename to runtags.deprecated From 1152e8c71bc22531594b6cdf57d1606300c956b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 15:20:34 -0400 Subject: [PATCH 08/16] Update iiab-install --- iiab-install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/iiab-install b/iiab-install index ec6a128c9..7704c0873 100755 --- a/iiab-install +++ b/iiab-install @@ -18,6 +18,13 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 + + if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then + echo -e "\nACTION REQUIRED: /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 + echo -e "To move it to the correct location, run:\n" >&2 + echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml" >&2 + fi + #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 From b27063afbc25b1f2fc8ed8af72be2585da6fbb83 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 15:28:34 -0400 Subject: [PATCH 09/16] Update iiab-install --- iiab-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 7704c0873..2399b4bbc 100755 --- a/iiab-install +++ b/iiab-install @@ -13,6 +13,7 @@ MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then + echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more" >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 @@ -20,7 +21,7 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then - echo -e "\nACTION REQUIRED: /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 + echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 echo -e "To move it to the correct location, run:\n" >&2 echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml" >&2 fi @@ -39,6 +40,8 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then exit 1 fi +# FUTURE: Test if their local_vars.yml is sufficiently version-compatible ! + echo -e "\n\n./iiab-install $* BEGUN IN $CWD\n" if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then From 9469cf836d3213ea784d814d7e10ab238bdd5c32 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 15:34:10 -0400 Subject: [PATCH 10/16] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 2399b4bbc..50f6b53e0 100755 --- a/iiab-install +++ b/iiab-install @@ -23,7 +23,7 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 echo -e "To move it to the correct location, run:\n" >&2 - echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml" >&2 + echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml\n" >&2 fi #case $OS in From 1457b1bfc2c7076cf0e9333dca8ec03f9bfb933a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 15:43:38 -0400 Subject: [PATCH 11/16] Update iiab-install --- iiab-install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iiab-install b/iiab-install index 50f6b53e0..01a408293 100755 --- a/iiab-install +++ b/iiab-install @@ -14,18 +14,18 @@ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then - echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 - echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more" >&2 - echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 - echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 - echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 - if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 echo -e "To move it to the correct location, run:\n" >&2 echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml\n" >&2 fi + echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more" >&2 + echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 + echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 + echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 + #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 From 993b7690e244050e41f4bf00a20ef08ab182d17b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 16:09:40 -0400 Subject: [PATCH 12/16] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 01a408293..f2d1d0b86 100755 --- a/iiab-install +++ b/iiab-install @@ -16,7 +16,7 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 - echo -e "To move it to the correct location, run:\n" >&2 + echo -e "TO MOVE IT TO THE CORRECT LOCATION, RUN:\n" >&2 echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml\n" >&2 fi From c848aa550cbf873e4e37a545c2cb5198df07a9ae Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 16:16:08 -0400 Subject: [PATCH 13/16] Update iiab-install --- iiab-install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index f2d1d0b86..9d5b2003e 100755 --- a/iiab-install +++ b/iiab-install @@ -16,8 +16,9 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 - echo -e "TO MOVE IT TO THE CORRECT LOCATION, RUN:\n" >&2 - echo -e " mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml\n" >&2 + echo -e "███████████████████ TO MOVE IT TO THE CORRECT LOCATION, RUN: ███████████████████" >&2 + echo -e "██ mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml ██" >&2 + echo -e "████████████████████████████████████████████████████████████████████████████████\n" >&2 fi echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 From b6d68456001d4903aecb793af2c66098a857eb7b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 24 Jul 2018 16:17:29 -0400 Subject: [PATCH 14/16] Update iiab-install --- iiab-install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iiab-install b/iiab-install index 9d5b2003e..81680e0aa 100755 --- a/iiab-install +++ b/iiab-install @@ -17,7 +17,9 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 echo -e "███████████████████ TO MOVE IT TO THE CORRECT LOCATION, RUN: ███████████████████" >&2 + echo -e "██ ██" >&2 echo -e "██ mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml ██" >&2 + echo -e "██ ██" >&2 echo -e "████████████████████████████████████████████████████████████████████████████████\n" >&2 fi From f1c498e639880213361073448a8bf811094bea69 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 25 Jul 2018 20:57:35 +0000 Subject: [PATCH 15/16] 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 16/16] 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