add v0.0.11

This commit is contained in:
2023-11-03 16:21:47 -07:00
parent 408e9202a3
commit dc809bc4c1
5 changed files with 244 additions and 29 deletions

View File

@@ -81,17 +81,17 @@ EOF
fi
mkdir -p /etc/grlx
if [ -z "$FARMER_INTERFACE" ]; then
FARMER_INTERFACE=$(gum input --value="localhost" --prompt="Choose an interface for the farmer: > ")
if [ -z "$FARMERINTERFACE" ]; then
FARMERINTERFACE=$(gum input --value="localhost" --prompt="Choose an interface for the farmer: > ")
fi
if [ -z "$FARMER_API_PORT" ]; then
FARMER_API_PORT=$(gum input --value=5405 --prompt="Choose a port for the farmer API: > ")
if [ -z "$FARMERAPIPORT" ]; then
FARMERAPIPORT=$(gum input --value=5405 --prompt="Choose a port for the farmer API: > ")
fi
if [ -z "$FARMER_BUS_PORT" ]; then
FARMER_BUS_PORT=$(gum input --value=5406 --prompt="Choose a port for the farmer bus: > ")
if [ -z "$FARMERBUSPORT" ]; then
FARMERBUSPORT=$(gum input --value=5406 --prompt="Choose a port for the farmer bus: > ")
fi
if [ -z "$FARMER_ORGANIZATION" ]; then
FARMER_ORGANIZATION=$(gum input --value="Your Organization" --prompt="Choose an organization name for the farmer: > ")
if [ -z "$FARMERORGANIZATION" ]; then
FARMERORGANIZATION=$(gum input --value="Your Organization" --prompt="Choose an organization name for the farmer: > ")
fi
if [ -z "$ADMIN_PUBKEYS" ]; then
ADMIN_PUBKEYS=()
@@ -102,10 +102,10 @@ EOF
fi
done
fi
if [ -z "$CERTHOSTS" ]; then
CERTHOSTS=()
if [ -z "$CERT_HOSTS" ]; then
CERT_HOSTS=()
while true; do
CERTHOSTS+=($(gum input --placeholder="mydomain.com" --prompt="Enter a domain or IP to generate a certificate for: > "))
CERT_HOSTS+=($(gum input --placeholder="mydomain.com" --prompt="Enter a domain or IP to generate a certificate for: > "))
if ! gum confirm "Add another domain or IP?"; then
break
fi
@@ -115,18 +115,17 @@ EOF
cat << EOF > /etc/grlx/farmer
certhosts:
$(for host in "${CERTHOSTS[@]}"; do echo " - $host"; done)
$(for host in "${CERT_HOSTS[@]}"; do echo " - $host"; done)
certificatevalidtime: 8760h0m0s
configroot: /etc/grlx/
farmerapiport: "$FARMER_API_PORT"
farmerbusport: "$FARMER_BUS_PORT"
farmerinterface: $FARMER_INTERFACE
farmerapiport: "$FARMERAPIPORT"
farmerbusport: "$FARMERBUSPORT"
farmerinterface: $FARMERINTERFACE
farmerpki: /etc/grlx/pki/farmer/
farmerurl: https://$FARMER_INTERFACE:$FARMER_API_PORT
keyfile: /etc/grlx/pki/farmer/tls-key.pem
nkeyfarmerprivfile: /etc/grlx/pki/farmer/farmer.nkey
nkeyfarmerpubfile: /etc/grlx/pki/farmer/farmer.nkey.pub
organization: $FARMER_ORGANIZATION
organization: $FARMERORGANIZATION
rootca: /etc/grlx/pki/farmer/tls-rootca.pem
rootcapriv: /etc/grlx/pki/farmer/tls-rootca-key.pem
pubkeys:

View File

@@ -24,27 +24,26 @@ esac
if [ ! -f /etc/grlx/sprout ]; then
mkdir -p /etc/grlx
if [ -z "$FARMER_INTERFACE" ]; then
echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer."
if [ -z "$FARMERINTERFACE" ]; then
echo "FARMERINTERFACE is not set. Please set it to the domain or IP of your farmer."
exit 1
fi
if [ -z "$FARMER_API_PORT" ]; then
FARMER_PORT=5405
if [ -z "$FARMERAPIPORT" ]; then
FARMERPORT=5405
fi
if [ -z "$FARMER_BUS_PORT" ]; then
FARMER_PORT=5406
if [ -z "$FARMERBUSPORT" ]; then
FARMERPORT=5406
fi
cat << EOF > /etc/grlx/sprout
farmerinterface: $FARMER_INTERFACE
farmerbusport: $FARMER_BUS_PORT
farmerapiport: $FARMER_API_PORT
farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT
farmerinterface: $FARMERINTERFACE
farmerbusport: $FARMERBUSPORT
farmerapiport: $FARMERAPIPORT
EOF
fi
chmod 600 /etc/grlx/sprout
curl -s "https://artifacts.grlx.dev/linux/${machine_arch}/v0.0.10/sprout" > /usr/local/bin/grlx-sprout
curl -s "https://artifacts.grlx.dev/linux/${machine_arch}/v0.0.11/sprout" > /usr/local/bin/grlx-sprout
chmod +x /usr/local/bin/grlx-sprout
cat << EOF > /etc/systemd/system/grlx-sprout.service