Updates from review

sillsdev · Mar 22, 2024 · 6a2f5d4 · 6a2f5d4
1 parent 82337d8
commit 6a2f5d4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th
     `dotnet tool update --global dotnet-reportgenerator-globaltool --version 5.0.4`
 11. [dotnet-project-licenses](https://github.com/tomchavakis/nuget-license)
     `dotnet tool update --global dotnet-project-licenses`
-12. Tools for generating the self installer [Linux only]:
+12. Tools for generating the self installer (Linux only):
 
     - [makeself](https://makeself.io/) - a tool to make self-extracting archives in Unix
     - [pandoc](https://pandoc.org/installing.html#linux) - a tool to convert Markdown documents to PDF.
@@ -517,7 +517,7 @@ of development setup errors. Run from within a Python virtual environment.
 python scripts/cleanup_local_repo.py
 ```
 
-### Generate Installer Script for The Combine (_Linux only_)
+### Generate Installer Script for The Combine (Linux only)
 
 To generate the installer script, run the following commands starting in the project top level directory:
 

diff --git a/deploy/ansible/playbook_desktop_setup.yaml b/deploy/ansible/playbook_desktop_setup.yaml
@@ -1,8 +1,8 @@
 ---
 ##############################################################
-# Playbook: playbook_desktop_install.yml
+# Playbook: playbook_desktop_setup.yml
 #
-# playbook_desktop_install.yml installs the packages and
+# playbook_desktop_setup.yml installs the packages and
 # configuration files that are required to run TheCombine
 # as containers managed by a Kubernetes cluster on localhost.
 #

diff --git a/deploy/ansible/playbook_nuc_setup.yaml b/deploy/ansible/playbook_nuc_setup.yaml
@@ -1,8 +1,8 @@
 ---
 ##############################################################
-# Playbook: playbook_nuc_install.yml
+# Playbook: playbook_nuc_setup.yml
 #
-# playbook_nuc_install.yml installs the packages and
+# playbook_nuc_setup.yml installs the packages and
 # configuration files that are required to run TheCombine
 # as Docker containers managed by a Kubernetes cluster on
 # a target PC, such as an Intel NUC.

diff --git a/deploy/ansible/roles/support_tools/files/combinectl.sh b/deploy/ansible/roles/support_tools/files/combinectl.sh
@@ -20,7 +20,7 @@ usage () {
                 The Combine does not run properly, download and run the
                 updated install package.
       wifi [wifi-passphrase]:
-                If no parameters are provieded, display the wifi
+                If no parameters are provided, display the wifi
                 passphrase.  If a new passphase is provided, the
                 wifi passphrase is updated to the new phrase.
                 If your passphrase has spaces or special characters,

diff --git a/deploy/ansible/roles/support_tools/files/display-eth-addr.sh b/deploy/ansible/roles/support_tools/files/display-eth-addr.sh
@@ -15,7 +15,6 @@ if [ -e "$TTY_DEV" ] ; then
     if [[ $ETH_IP == "" && $ETH_STATUS == "" ]] ; then
         # set red background
         echo -en \\xfe\\xd0\\xff\\x1f\\x1f  > ${TTY_DEV}
-        #     1234567890123456
         echo "  NO ETHERNET" > ${TTY_DEV}
         echo -n "   CONNECTED" > ${TTY_DEV}
     else

diff --git a/deploy/ansible/roles/support_tools/templates/display-eth.timer.j2 b/deploy/ansible/roles/support_tools/templates/display-eth.timer.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=Display Ethernet Address on support tool display
+Description=Timer to trigger display-eth.service
 
 [Timer]
 OnUnitActiveSec={{ eth_update_period }}

diff --git a/deploy/ansible/roles/wifi_ap/tasks/install.yml b/deploy/ansible/roles/wifi_ap/tasks/install.yml
@@ -64,7 +64,7 @@
 - name: Redirect traffic for The Combine to the AP gateway
   lineinfile:
     path: /etc/hosts
-    regexp: ^{{ ap_gateway }}
+    regexp: ^{{ ap_gateway.replace(".", "\\.") }}
     state: present
     line: "{{ ap_gateway }} {{ ap_hostname }}.{{ ap_domain }} {{ ap_hostname }} rancher.{{ ap_domain }}"