From da9d36528c950af9b590c6c2f4576276f0a3c963 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Jul 2023 17:47:56 +0000 Subject: [PATCH] Added auto discover initial commit --- bin/.env | 12 ++--- bin/install-federated | 1 + lib/autodiscover.sh | 109 ++++++++++++++++++++++++++++++++++++++++++ lib/functions.sh | 2 +- 4 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 lib/autodiscover.sh diff --git a/bin/.env b/bin/.env index 98d5b31..22e9572 100644 --- a/bin/.env +++ b/bin/.env @@ -1,8 +1,8 @@ # Domain name -DOMAIN="crudgingtons.net" +DOMAIN="f11228a1.federatedcomputer.cloud" # Company name -COMPANY="The Crudgingtons" +COMPANY="f11228a1 Federated Core" # Country Code (US, HK, GB, JP, etc) COUNTRY="US" @@ -10,12 +10,6 @@ COUNTRY="US" # Where to send welcome e-mail EMAIL="derek@federated.computer" -# Admin password -ADMINPASS="password123" - -# Listmonk password -LISTMONKPASS="password123" - # Backblaze KeyID (Master Key) for backups B2_APPLICATION_KEY_ID="3239c6765fdc" @@ -23,4 +17,4 @@ B2_APPLICATION_KEY_ID="3239c6765fdc" B2_APPLICATION_KEY="0050ac8837466cbca0e0aa574b5f8332f706a5e26c" # Email address for alerts on services that fail to start -ALERTS_EMAIL="alerts@federated.computer" +ALERTS_EMAIL="derek@federated.computer" diff --git a/bin/install-federated b/bin/install-federated index e15ae5e..af81578 100755 --- a/bin/install-federated +++ b/bin/install-federated @@ -38,6 +38,7 @@ get_config() { . /federated/lib/baserow.sh . /federated/lib/gitea.sh . /federated/lib/caddy.sh + . /federated/lib/autodiscover.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") diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh new file mode 100644 index 0000000..c49ea52 --- /dev/null +++ b/lib/autodiscover.sh @@ -0,0 +1,109 @@ +#!/bin/bash +# +# Autodiscover service for mail + +PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +config_autodiscover() { + echo -ne "\n* Configuring /federated/apps/autodiscover container.." + spin & + SPINPID=$! + + if [ ! -d "/federated/apps/autodiscover" ]; then + mkdir -p /federated/apps/autodiscover + fi + +cat > /federated/apps/autodiscover/docker-compose.yml < /federated/apps/autodiscover/.env < /dev/null +echo -ne "done." +} + +start_autodiscover() { + # Start service with command to make sure it's up before proceeding + start_service "autodiscover" "nc -z 172.99.0.32 8000 &> /dev/null" "8" + + kill -9 $SPINPID &> /dev/null + echo -ne "done." +} diff --git a/lib/functions.sh b/lib/functions.sh index b5572e8..7921bc1 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -1,7 +1,7 @@ # Federated Computer functions # Define all services -SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy") +SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy" "autodiscover") fail() { echo -ne "FAILED\n\n$1\n\n"