From 06e999752ee1b67a901299213e3a53b163b76c91 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:12:11 -0500
Subject: [PATCH] minor updates

---
 .github/labeler.yml               |  1 +
 CHANGES.md                        | 13 ++++++++-----
 birdhouse/pavics-compose.sh       |  1 -
 birdhouse/read-configs.include.sh |  2 +-
 vagrant_variables.yml.example     |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index c33bb4499..377ad298b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -22,6 +22,7 @@ ci/deployment:
   - vagrant_variables.yml.example
   - Vagrantfile
   - birdhouse/**/*.include.sh
+  - birdhouse/pavics-compose.sh
   - birdhouse/birdhouse-compose.sh
 
 ci/tests:
diff --git a/CHANGES.md b/CHANGES.md
index f1d70e6d4..5ad9fbd32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,8 +26,8 @@
 
   This update makes the following changes:
 
-  * The string ``"PAVICS"`` in environment variables, constant values, and file names have been changed to 
-    ``"BIRDHOUSE"`` (case has been preserved where possible).
+  * The string ``PAVICS`` in environment variables, constant values, and file names have been changed to 
+    ``BIRDHOUSE`` (case has been preserved where possible).
     * For example:
       * ``PAVICS_FQDN`` -> ``BIRDHOUSE_FQDN``
       * ``pavics_compose.sh`` -> ``birdhouse_compose.sh``
@@ -35,13 +35,13 @@
   * Comment strings and documentation that refers to the software stack as ``PAVICS`` have been changed to use
     ``Birdhouse``.
   * Recreated the ``pavics-compose.sh`` script that runs ``birdhouse-compose.sh`` in backwards compatible mode.
-    * Backwards compatible mode means that variables in ``env.local`` that contain the string ``"PAVICS"`` will be used
-      to set the equivalent variable that contains ``"BIRDHOUSE"``. For example, the ``PAVICS_FQDN`` variable set in
+    * Backwards compatible mode means that variables in ``env.local`` that contain the string ``PAVICS`` will be used
+      to set the equivalent variable that contains ``BIRDHOUSE``. For example, the ``PAVICS_FQDN`` variable set in
       the ``env.local`` file will be used to set the value of ``BIRDHOUSE_FQDN``.
   
   Migration Guide:
 
-  - Update ``env.local`` file to replace all variables that contain ``"PAVICS"`` with ``"BIRDHOUSE"``.
+  - Update ``env.local`` file to replace all variables that contain ``PAVICS`` with ``BIRDHOUSE``.
     * see [`env.local.example`](./birdhouse/env.local.example) to see new variable names
     * see the ``BACKWARDS_COMPATIBLE_VARIABLES_PAVICS`` variable (defined in 
       [`default.env`](./birdhouse/default.env)) for a full list of changed environment variable names.
@@ -67,6 +67,9 @@
     | JUPYTERHUB_IMAGE_SELECTION_NAMES           | (no change)                 | pavics            | birdhouse          |
     | PAVICS_LOG_DIR                             | BIRDHOUSE_LOG_DIR           | /var/log/PAVICS   | /var/log/birdhouse |
 
+  - update any jupyter notebooks that make use of the `PAVICS_HOST_URL` environment variable to use the new
+    `BIRDHOUSE_HOST_URL` instead.
+
 
 [2.1.0](https://github.com/bird-house/birdhouse-deploy/tree/2.1.0) (2024-02-23)
 ------------------------------------------------------------------------------------------------------------------
diff --git a/birdhouse/pavics-compose.sh b/birdhouse/pavics-compose.sh
index 570c0eef5..142897199 100755
--- a/birdhouse/pavics-compose.sh
+++ b/birdhouse/pavics-compose.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# we switch to the real directory of the script, so it still works when used from $PATH
 THIS_FILE="$(readlink -f "$0" || realpath "$0")"
 THIS_DIR="$(dirname "${THIS_FILE}")"
 
diff --git a/birdhouse/read-configs.include.sh b/birdhouse/read-configs.include.sh
index 7a02da537..506adec76 100644
--- a/birdhouse/read-configs.include.sh
+++ b/birdhouse/read-configs.include.sh
@@ -228,7 +228,7 @@ check_default_vars() {
         result=`echo "${d}" | grep -c "${default}"`
         if [ -z "`eval "echo ${v}"`" ]
         then
-            log DEBUG "Optional variable [${n}] is not set. Check env.local file."
+            log WARN "Optional variable [${n}] is not set. Check env.local file."
         fi
         if [ "${result}" -gt 0 ]
         then
diff --git a/vagrant_variables.yml.example b/vagrant_variables.yml.example
index b7cb9321a..4b72bb703 100644
--- a/vagrant_variables.yml.example
+++ b/vagrant_variables.yml.example
@@ -9,7 +9,7 @@
 # extra DNS entry and also set it manually in your
 # /etc/hosts file.
 hostname: mybirdhouse
-domain: example.ca
+domain: example.com
 
 # Set network bridge, else you'll simply be prompted on vagrant up.
 # network_bridge: enp0s25