From ef6dbc197aaa9bf43805474347d5e164d53428f6 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sun, 17 Dec 2017 18:09:14 -0700
Subject: [PATCH] Updated main settings and timezones

---
 .bin/Scripts/settings/main.py                 | 26 ++++++++++++++-----
 .../systemd-timesyncd.service                 |  1 +
 .../live/airootfs/usr/local/bin/wifi.conf     |  9 -------
 Build Linux                                   |  6 ++---
 4 files changed, 23 insertions(+), 19 deletions(-)
 create mode 120000 .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
 delete mode 100644 .linux_items/include/live/airootfs/usr/local/bin/wifi.conf

diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py
index f64c7979..d48b0ba0 100644
--- a/.bin/Scripts/settings/main.py
+++ b/.bin/Scripts/settings/main.py
@@ -3,18 +3,30 @@
 # Features
 ENABLED_UPLOAD_DATA = False
 
-# STATIC VARIABLES (also used by .cmd files)
-## Not using spaces aroung '=' for easier .cmd substrings
+# STATIC VARIABLES (also used by BASH and BATCH files)
+## NOTE: There are no spaces around the = for easier parsing in BASH and BATCH
+# Main Kit
 ARCHIVE_PASSWORD='Abracadabra'
 KIT_NAME_FULL='Wizard Kit'
 KIT_NAME_SHORT='WK'
-LINUX_TECH_PASSWORD='Abracadabra'
-LINUX_TIME_ZONE='America/Los_Angeles'
-LINUX_ROOT_PASSWORD='Abracadabra'
+SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
+# Live Linux
+DIAG_SHARE='/srv/ClientInfo'
+DIAG_USER='wkdiag'
+MPRIME_LIMIT='7'                          # of minutes to run Prime95 during hw-diags
+ROOT_PASSWORD='Abracadabra'
+SKIP_UPLOAD='False'
+TECH_PASSWORD='Abracadabra'
+# Server IP addresses
+DIAG_SERVER='10.0.0.10'
 OFFICE_SERVER_IP='10.0.0.10'
 QUICKBOOKS_SERVER_IP='10.0.0.10'
-SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
-TIME_ZONE='Pacific Standard Time' # Always use "Standard Time" (DST is applied correctly)
+# Time Zones
+LINUX_TIME_ZONE='America/Los_Angeles'     # See 'timedatectl list-timezones' for valid values
+WINDOWS_TIME_ZONE='Pacific Standard Time' # See 'tzutil /l' for valid values
+# WiFi
+WIFI_SSID='SomeWifi'
+WIFI_PASSWORD='Abracadabra'
 
 # SERVER VARIABLES
 ## NOTE: Windows can only use one user per server. This means that if
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
new file mode 120000
index 00000000..cd004113
--- /dev/null
+++ b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-timesyncd.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/usr/local/bin/wifi.conf b/.linux_items/include/live/airootfs/usr/local/bin/wifi.conf
deleted file mode 100644
index 0b0d5850..00000000
--- a/.linux_items/include/live/airootfs/usr/local/bin/wifi.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-network={
-    ssid="SomeWiFi"
-    psk="Abracadabra"
-    priority=5
-}
diff --git a/Build Linux b/Build Linux
index 4c372daa..0f4501fd 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -170,7 +170,7 @@ function update_live_env() {
     sed -i -r 's/^(.*PermitRootLogin.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     
     # Root user
-    echo "echo 'root:$LINUX_ROOT_PASSWORD' | chpasswd" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    echo "echo 'root:$ROOT_PASSWORD' | chpasswd" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
 
     # Sudo
     echo "echo '%wheel ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
@@ -178,7 +178,7 @@ function update_live_env() {
     # Tech user
     echo "groupadd -r autologin" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     echo "useradd -m -s /bin/zsh -G autologin,power,storage,wheel -U $username" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
-    echo "echo '$username:$LINUX_TECH_PASSWORD' | chpasswd" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    echo "echo '$username:$TECH_PASSWORD' | chpasswd" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
 
     # Tech user autologin
     mkdir -p "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d"
@@ -187,7 +187,7 @@ function update_live_env() {
     echo "ExecStart=-/sbin/agetty --autologin $username --noclear %I 38400 linux" >> "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf"
 
     # Timezone
-    sed -i -r "s#zoneinfo/UTC#$LINUX_TIME_ZONE#g" "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    echo "ln -sf '/usr/share/zoneinfo/$LINUX_TIME_ZONE' '/etc/localtime'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     echo 'sed -i "s/#FallbackNTP/NTP/" /etc/systemd/timesyncd.conf' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
 
     # udevil fix