Rename local config file to install.local.cfg

.github/workflows/shell.yml

@@ -78,12 +78,12 @@ jobs:
 
       - name: Set local config
         run: |
-          cp cfg/install.cfg cfg/install.local
+          cp cfg/install.cfg cfg/install.local.cfg
           sed -ri \
             -e 's@^(civi_db_user_name)=.*$@\1=db_admin@' \
             -e 's@^(civi_db_user_pass)=.*$@\1=admin@' \
             -e 's@^(civi_domain)=.*$@\1=civi.local.com@' \
-            cfg/install.local
+            cfg/install.local.cfg
 
       - name: Setup environment
         run: ./bin/prepare.sh

.gitignore

@@ -5,4 +5,4 @@
 /web/
 
 # Local configs
-/cfg/install.local
+/cfg/install.local.cfg

README.md

@@ -22,8 +22,8 @@ Currently only Ubuntu is supported.
 1. Check out repo
 1. Config installer
     1. Check `cfg/install.cfg` for defaults
-    1. Duplicate `cfg/install.cfg` and rename to `cfg/install.local`
-    1. Change relevant configs in `cfg/install.local`
+    1. Duplicate `cfg/install.cfg` and rename to `cfg/install.local.cfg`
+    1. Change relevant configs in `cfg/install.local.cfg`
 1. Run `bin/prepare.sh`
 1. Run `bin/install.sh`, usage:
 

bin/clear-cache.sh

@@ -21,7 +21,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1:-${base_dir}}"

bin/dev-config.sh

@@ -21,7 +21,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1:-${base_dir}}"

bin/extension.sh

@@ -24,7 +24,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1?:Install dir missing}"

bin/init-test-DB.sh

@@ -21,7 +21,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1:-${base_dir}}"

bin/install.sh

@@ -24,7 +24,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1:-${base_dir}}"

bin/prepare.sh

@@ -20,7 +20,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 print-header Install Apache...
 sudo apt-get --quiet install --yes --no-install-recommends --no-upgrade apache2
@@ -29,6 +29,10 @@ sudo systemctl enable apache2.service
 sudo systemctl restart apache2.service
 print-finish
 
+print-header Verify Apache version...
+apachectl -V
+print-finish
+
 print-header Install MariaDB...
 curl -LsS -O https://r.mariadb.com/downloads/mariadb_repo_setup
 echo "${mariadb_repo_setup_checksum}  mariadb_repo_setup" | sha256sum --check --strict -
@@ -58,11 +62,20 @@ sudo sed -i \
     "/etc/php/${php_version}/mods-available/civi.php.ini"
 print-finish
 
+print-header Verify PHP version...
+php --version
+print-finish
+
 print-status Install PHP tools...
 sudo curl -LsS -o "${local_bin}/composer" "${url_composer}"
 sudo curl -LsS -o "${local_bin}/cv" "${url_cv}"
 sudo chmod +x "${local_bin}/composer"
 sudo chmod +x "${local_bin}/cv"
 print-finish
 
+print-header PHP tools version...
+composer --version
+cv --version
+print-finish
+
 exit 0

bin/reinstall.sh

@@ -24,7 +24,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1:-${base_dir}}"

bin/tests.sh

@@ -23,7 +23,7 @@ base_dir=$(builtin cd "$(dirname "${0}")/.." >/dev/null 2>&1 && pwd)
 # shellcheck source=cfg/install.cfg
 . "${base_dir}/cfg/install.cfg"
 # shellcheck disable=SC1091
-[[ -r "${base_dir}/cfg/install.local" ]] && . "${base_dir}/cfg/install.local"
+[[ -r "${base_dir}/cfg/install.local.cfg" ]] && . "${base_dir}/cfg/install.local.cfg"
 
 # Parse options
 install_dir="${1?:Install dir missing}"

cfg/install.cfg

@@ -3,8 +3,8 @@
 ##                      ##
 ## Default configs      ##
 ## All of these options ##
-## can be overriden     ##
-## in install.local     ##
+## can be overridden    ##
+## in install.local.cfg ##
 ##########################
 
 ## Services