From c48ab36cfe8b52d7383af4d9396599ad9ec286b3 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 15 Oct 2018 03:17:49 -0400
Subject: [PATCH] Update default_vars.yml

---
 vars/default_vars.yml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 03d11ca75..2a5357af4 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -5,11 +5,10 @@
 
 # By convention we use True/False to indicate boolean constants.
 
-# Installation Constants
-content_base: "/library"
-#doc_base: "/var"
-doc_base: "{{ content_base }}/www"
-doc_root: "{{ doc_base }}/html"
+# Configuration File(s)
+iiab_local_vars_file: /etc/iiab/local_vars.yml
+iiab_config_file: /etc/iiab/iiab.ini
+service_filelist: "{{ iiab_config_file }}"
 
 iiab_base: /opt/iiab
 iiab_dir: "{{ iiab_base }}/iiab"
@@ -17,18 +16,17 @@ pip_packages_dir: "{{ iiab_base }}/pip-packages"
 yum_packages_dir: "{{ iiab_base }}/yum-packages"
 downloads_dir: "{{ iiab_base }}/downloads"
 iiab_download_url: http://download.iiab.io/packages
+
+content_base: "/library"
+doc_base: "{{ content_base }}/www"
+doc_root: "{{ doc_base }}/html"
+
 # Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
 download_timeout: 200
 
-# Configuration File(s)
-iiab_config_file: /etc/iiab/iiab.ini
-iiab_local_vars_file: /etc/iiab/local_vars.yml
-service_filelist: "{{ iiab_config_file }}"
-
-# The following variable may be useful in debugging
-disregard_network: False  # use cache or error out if cache does not exist
-
-# Users and Passwords
+# Languages (for Apache)
+default_language: en
+language_priority: en es fr
 
 # Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel
 # group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo-
@@ -44,20 +42,19 @@ iiab_admin_new_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXi
 # Obtain a password hash - OLD WAY:
 #    python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 
-# Languages (for Apache)
-default_language: en
-language_priority: en es fr
-
 # Time Zone (php needs timezone to be set)
 local_tz: "{{ ansible_date_time.tz }}"
 
 # Read https://github.com/iiab/iiab/wiki/IIAB-Networking
 # Also readable offline @ http://box/info/IIAB-Networking.html
 
-# NETWORK PARAMETERS FOLLOW ACROSS THE NEXT 65 LINES, as enabled by Ansible's
+# NETWORK PARAMETERS FOLLOW ACROSS THE NEXT 100 LINES, as enabled by Ansible's
 # NETWORK role (/opt/iiab/iiab/roles/network/*) in 4-SERVER-OPTIONS below.
 # SEE ALSO: /opt/iiab/iiab/roles/network/defaults/main.yml
 
+# The following variable may be useful in debugging
+disregard_network: False  # use cache or error out if cache does not exist
+
 iiab_hostname: box
 iiab_domain: lan
 lan_ip: 172.18.96.1