diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 51ea99727..e9efb6c2e 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -13,7 +13,6 @@ set_fact: rpi_model: "{{ ansible_local.local_facts.rpi_model }}" xo_model: "{{ ansible_local.local_facts.xo_model }}" - phplib_dir: "{{ ansible_local.local_facts.phplib_dir }}" iiab_stage: "{{ ansible_local.local_facts.stage }}" # We need to inialize the ini file and only write the location and version @@ -123,8 +122,6 @@ value: "{{ iiab_base_ver }}" - option: iiab_revision value: "{{ iiab_revision }}" - - option: runtime_php - value: "{{ phplib_dir }}" - option: runtime_branch value: "{{ ansible_local.local_facts.iiab_branch }}" - option: runtime_commit diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index e85801976..d3db1c5d7 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -1,6 +1,6 @@ #!/bin/bash -# 2020-10-19: Most of the 12 variables require a command[*] to be run to +# 2020-10-27: Most of the 11 variables require a command[*] to be run to # establish the var's value. WE DISPLAY ALL ERRORS / DIAGNOSTICS AND CONTINUE. # # [*] DOESN'T MATTER WHAT COMMAND: so long as it fails with Return Code != 0 @@ -11,7 +11,6 @@ OS="none" VERSION_ID="none" # This var's combined with the above, before being output IIAB_BRANCH="none" IIAB_COMMIT="none" -PHPLIB_DIR="none" XO_MODEL="none" RPI_MODEL="none" ANSIBLE_VERSION="none" @@ -77,14 +76,6 @@ tmp=$(git rev-parse --abbrev-ref HEAD) && tmp=$(git rev-parse --verify HEAD) && IIAB_COMMIT=$tmp -if [ -d /usr/lib64/php ]; then - PHPLIB_DIR=/usr/lib64/php -elif [ -d /usr/lib/php5 ]; then - PHPLIB_DIR=/usr/lib/php5 -elif [ -d /usr/lib/php ]; then - PHPLIB_DIR=/usr/lib/php -fi - tmp=$(cat /proc/device-tree/mfg-data/MN) && XO_MODEL=$tmp @@ -117,8 +108,7 @@ tmp=$(systemctl is-enabled systemd-networkd) cat <