From 322b67fb8a768bfed60ee690f5895f4993c23167 Mon Sep 17 00:00:00 2001 From: Derek Crudgington Date: Tue, 21 Feb 2023 21:12:57 +0000 Subject: [PATCH] Added default_phone_region check --- bin/install-federated.sh | 13 +++++++++++++ lib/nextcloud.sh | 1 + 2 files changed, 14 insertions(+) diff --git a/bin/install-federated.sh b/bin/install-federated.sh index 28cb508..91b6169 100755 --- a/bin/install-federated.sh +++ b/bin/install-federated.sh @@ -38,9 +38,19 @@ get_config() { . /federated/lib/baserow.sh . /federated/lib/calcom.sh + COUNTRIES=("AF" "AL" "DZ" "AS" "AD" "AO" "AI" "AQ" "AG" "AR" "AM" "AW" "AU" "AT" "AZ" "BS" "BH" "BD" "BB" "BY" "BE" "BZ" "BJ" "BM" "BT" "BO" "BO" "BA" "BW" "BV" "BR" "IO" "BN" "BN" "BG" "BF" "BI" "KH" "CM" "CA" "CV" "KY" "CF" "TD" "CL" "CN" "CX" "CC" "CO" "KM" "CG" "CD" "CK" "CR" "CI" "CI" "HR" "CU" "CY" "CZ" "DK" "DJ" "DM" "DO" "EC" "EG" "SV" "GQ" "ER" "EE" "ET" "FK" "FO" "FJ" "FI" "FR" "GF" "PF" "TF" "GA" "GM" "GE" "DE" "GH" "GI" "GR" "GL" "GD" "GP" "GU" "GT" "GG" "GN" "GW" "GY" "HT" "HM" "VA" "HN" "HK" "HU" "IS" "IN" "ID" "IR" "IQ" "IE" "IM" "IL" "IT" "JM" "JP" "JE" "JO" "KZ" "KE" "KI" "KP" "KR" "KR" "KW" "KG" "LA" "LV" "LB" "LS" "LR" "LY" "LY" "LI" "LT" "LU" "MO" "MK" "MG" "MW" "MY" "MV" "ML" "MT" "MH" "MQ" "MR" "MU" "YT" "MX" "FM" "MD" "MC" "MN" "ME" "MS" "MA" "MZ" "MM" "MM" "NA" "NR" "NP" "NL" "AN" "NC" "NZ" "NI" "NE" "NG" "NU" "NF" "MP" "NO" "OM" "PK" "PW" "PS" "PA" "PG" "PY" "PE" "PH" "PN" "PL" "PT" "PR" "QA" "RE" "RO" "RU" "RU" "RW" "SH" "KN" "LC" "PM" "VC" "VC" "VC" "WS" "SM" "ST" "SA" "SN" "RS" "SC" "SL" "SG" "SK" "SI" "SB" "SO" "ZA" "GS" "SS" "ES" "LK" "SD" "SR" "SJ" "SZ" "SE" "CH" "SY" "TW" "TW" "TJ" "TZ" "TH" "TL" "TG" "TK" "TO" "TT" "TN" "TR" "TM" "TC" "TV" "UG" "UA" "AE" "GB" "US" "UM" "UY" "UZ" "VU" "VE" "VE" "VN" "VN" "VG" "VI" "WF" "EH" "YE" "ZM" "ZW") + echo -ne "\nFederated Stack install script\n\n" read -p '* Enter domain name (domain.com): ' DOMAIN read -p '* Enter company name (Domain Company): ' COMPANY + read -p '* Enter country code: ' COUNTRY + while [ true ]; do + if printf '%s\0' "${COUNTRIES[@]}" | grep -Fxqz -- "$COUNTRY"; then + break + else + read -p "* Invalid, choose a country code (US, GB, HK, etc): " COUNTRY + fi + done read -sp '* Enter admin password to use for initial login: ' ADMINPASS [ -z "$DOMAIN" ] && failcheck "Must enter a domain name" [ -z "$COMPANY" ] && failcheck "Must enter a company name" @@ -76,3 +86,6 @@ done # Print out federated environment details print_details echo -ne "\n\n" + + + diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh index 9ddce96..2b6fb2b 100644 --- a/lib/nextcloud.sh +++ b/lib/nextcloud.sh @@ -232,6 +232,7 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin ./occ ldap:set-config s01 ldapConfigurationActive 1 ./occ ldap:set-config s01 ldap_expert_username_attr uid ./occ config:system:set overwriteprotocol --value=https +./occ config:system:set default_phone_region --value="$COUNTRY" ./occ config:system:delete trusted_domains ./occ config:system:set trusted_domains 1 --value=* ADMINUUID=\`./occ user:list | grep admin | awk '{ print \$2 }' | awk -F: '{ print \$1 }'\`