From 395ec3febaa8712980a4630aac42dca8544b4d2a Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Sat, 21 Oct 2023 02:29:40 -0700 Subject: [PATCH] remove broken build, change x86_64 name --- latest/farmer | 6 +-- latest/sprout | 2 +- v0.0.4/farmer | 136 -------------------------------------------------- v0.0.4/sprout | 63 ----------------------- v0.0.5/farmer | 6 +-- v0.0.5/sprout | 2 +- v0.0.6/farmer | 6 +-- v0.0.6/sprout | 2 +- 8 files changed, 12 insertions(+), 211 deletions(-) delete mode 100755 v0.0.4/farmer delete mode 100755 v0.0.4/sprout diff --git a/latest/farmer b/latest/farmer index 15115ea..f995e7d 100755 --- a/latest/farmer +++ b/latest/farmer @@ -8,7 +8,7 @@ case $arch in machine_arch="x86_64" ;; "i686"|"i386") - machine_arch="x86" + machine_arch="amd64" ;; "aarch64"|"arm64"|"armv8") machine_arch="arm64" @@ -62,7 +62,7 @@ if [ ! -f /etc/grlx/farmer ]; then fi #trap 'rm -r "$tempdir"' EXIT case $machine_arch in - "x86_64") + "amd64") curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" ;; "arm64") @@ -136,7 +136,7 @@ EOF fi useradd -r -s /usr/sbin/nologin farmer >/dev/null || true -chown farmer:farmer /etc/grlx +chown -R farmer:farmer /etc/grlx chmod 700 /etc/grlx systemctl daemon-reload systemctl enable --now grlx-farmer diff --git a/latest/sprout b/latest/sprout index dec6110..266eb75 100755 --- a/latest/sprout +++ b/latest/sprout @@ -5,7 +5,7 @@ arch=$(uname -m) case $arch in "x86_64") - machine_arch="x86_64" + machine_arch="amd64" ;; "i686"|"i386") machine_arch="x86" diff --git a/v0.0.4/farmer b/v0.0.4/farmer deleted file mode 100755 index b437d9d..0000000 --- a/v0.0.4/farmer +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/env bash -set -e -o pipefail - -# determine machine architecture -arch=$(uname -m) -case $arch in - "x86_64") - machine_arch="x86_64" - ;; - "aarch64"|"arm64"|"armv8") - machine_arch="arm64" - ;; - *) - echo "Unknown machine architecture: $arch" - exit 1 - ;; -esac - - -# install farmer - -if [ ! -f /usr/local/bin/grlx-farmer ]; then - curl -f -L -s "https://artifacts.grlx.dev/linux/${machine_arch}/v0.0.4/farmer" > /usr/local/bin/grlx-farmer - chmod +x /usr/local/bin/grlx-farmer -fi - -# install systemd service -cat << EOF > /etc/systemd/system/grlx-farmer.service -[Unit] -Description=grlx farmer -Documentation=https://docs.grlx.dev -After=network-online.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/grlx-farmer -Restart=always -RestartSec=30 -User=farmer -Group=farmer - -[Install] -WantedBy=multi-user.target -EOF - -# configure farmer if it's not already configured -if [ ! -f /etc/grlx/farmer ]; then - # install gum if it's not already installed for interactive config - if ! command -v gum >/dev/null 2>&1; then - tempdir="" - if command -v mktemp >/dev/null 2>&1; then - tempdir=$(mktemp -d) - else - tempdir="/tmp/grlx-farmer-gum" - mkdir -p "$tempdir" - fi - #trap 'rm -r "$tempdir"' EXIT - case $machine_arch in - "x86_64") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" - ;; - "arm64") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_arm64.tar.gz" > "$tempdir/gum.tar.gz" - ;; - "arm") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_arm.tar.gz" > "$tempdir/gum.tar.gz" - ;; - esac - echo "Installing gum..." - echo "$tempdir" - ls -ashil "$tempdir" - tar -C "$tempdir" -xzf "$tempdir/gum.tar.gz" - mv "$tempdir/gum" /usr/local/bin/gum - chmod +x /usr/local/bin/gum - fi - - mkdir -p /etc/grlx - if [ -z "$FARMER_INTERFACE" ]; then - FARMER_INTERFACE=$(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: > ") - fi - if [ -z "$FARMER_BUS_PORT" ]; then - FARMER_BUS_PORT=$(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: > ") - fi - if [ -z "$ADMIN_PUBKEYS" ]; then - ADMIN_PUBKEYS=() - while true; do - ADMIN_PUBKEYS+=($(gum input --width=57 --placeholder="ABC25HBCYNHYMIFTN372NCKASUQPJCTBA66GLKXFYM3QGRP42IC5BYYF" --prompt="Enter an admin public key (generated by 'grlx auth pubkey'): > ")) - if ! gum confirm "Add another admin public key?"; then - break - fi - done - fi - if [ -z "$CERTHOSTS" ]; then - CERTHOSTS=() - while true; do - CERTHOSTS+=($(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 - done - fi - - - cat << EOF > /etc/grlx/farmer -certhosts: -$(for host in "${CERTHOSTS[@]}"; do echo " - $host"; done) -certificatevalidtime: 8760h0m0s -configroot: /etc/grlx/ -farmerapiport: "$FARMER_API_PORT" -farmerbusport: "$FARMER_BUS_PORT" -farmerinterface: $FARMER_INTERFACE -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 -rootca: /etc/grlx/pki/farmer/tls-rootca.pem -rootcapriv: /etc/grlx/pki/farmer/tls-rootca-key.pem -pubkeys: - admin: -$(for key in "${ADMIN_PUBKEYS[@]}"; do echo " - $key"; done) -EOF - -fi -useradd -r -s /usr/sbin/nologin farmer >/dev/null || true -chown farmer:farmer /etc/grlx -chmod 700 /etc/grlx -systemctl daemon-reload -systemctl enable --now grlx-farmer diff --git a/v0.0.4/sprout b/v0.0.4/sprout deleted file mode 100755 index ef43c09..0000000 --- a/v0.0.4/sprout +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash -set -e -o pipefail - -arch=$(uname -m) - -case $arch in - "x86_64") - machine_arch="x86_64" - ;; - "aarch64"|"arm64"|"armv8") - machine_arch="arm64" - ;; - *) - echo "Unknown machine architecture: $arch" - exit 1 - ;; -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." - exit 1 - fi - if [ -z "$FARMER_API_PORT" ]; then - FARMER_PORT=5405 - fi - if [ -z "$FARMER_BUS_PORT" ]; then - FARMER_PORT=5406 - fi - - cat << EOF > /etc/grlx/sprout -farmerinterface: $FARMER_INTERFACE -farmerbusport: $FARMER_BUS_PORT -farmerapiport: $FARMER_API_PORT -farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT -EOF -fi -chmod 600 /etc/grlx/sprout - -curl -s "https://artifacts.grlx.dev/linux/${machine_arch}/v0.0.4/sprout" > /usr/local/bin/grlx-sprout -chmod +x /usr/local/bin/grlx-sprout - -cat << EOF > /etc/systemd/system/grlx-sprout.service -[Unit] -Description=grlx sprout -Documentation=https://docs.grlx.dev -After=network-online.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/grlx-sprout -Restart=always -RestartSec=30 -User=root -Group=root - -[Install] -WantedBy=multi-user.target -EOF - -systemctl daemon-reload -systemctl enable --now grlx-sprout diff --git a/v0.0.5/farmer b/v0.0.5/farmer index e0f2a4f..ac1a35f 100755 --- a/v0.0.5/farmer +++ b/v0.0.5/farmer @@ -5,7 +5,7 @@ set -e -o pipefail arch=$(uname -m) case $arch in "x86_64") - machine_arch="x86_64" + machine_arch="amd64" ;; "aarch64"|"arm64"|"armv8") machine_arch="arm64" @@ -56,7 +56,7 @@ if [ ! -f /etc/grlx/farmer ]; then fi #trap 'rm -r "$tempdir"' EXIT case $machine_arch in - "x86_64") + "amd64") curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" ;; "arm64") @@ -130,7 +130,7 @@ EOF fi useradd -r -s /usr/sbin/nologin farmer >/dev/null || true -chown farmer:farmer /etc/grlx +chown -R farmer:farmer /etc/grlx chmod 700 /etc/grlx systemctl daemon-reload systemctl enable --now grlx-farmer diff --git a/v0.0.5/sprout b/v0.0.5/sprout index 3cd3f6d..f306e15 100755 --- a/v0.0.5/sprout +++ b/v0.0.5/sprout @@ -5,7 +5,7 @@ arch=$(uname -m) case $arch in "x86_64") - machine_arch="x86_64" + machine_arch="amd64" ;; "aarch64"|"arm64"|"armv8") machine_arch="arm64" diff --git a/v0.0.6/farmer b/v0.0.6/farmer index eaba790..00ac52d 100755 --- a/v0.0.6/farmer +++ b/v0.0.6/farmer @@ -5,7 +5,7 @@ set -e -o pipefail arch=$(uname -m) case $arch in "x86_64") - machine_arch="x86_64" + machine_arch="amd64" ;; "i686"|"i386") machine_arch="386" @@ -65,7 +65,7 @@ if [ ! -f /etc/grlx/farmer ]; then "386") curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_i386.tar.gz" > "$tempdir/gum.tar.gz" ;; - "x86_64") + "amd64") curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" ;; "arm64") @@ -139,7 +139,7 @@ EOF fi useradd -r -s /usr/sbin/nologin farmer >/dev/null || true -chown farmer:farmer /etc/grlx +chown -R farmer:farmer /etc/grlx chmod 700 /etc/grlx systemctl daemon-reload systemctl enable --now grlx-farmer diff --git a/v0.0.6/sprout b/v0.0.6/sprout index 8e30798..5b2847e 100755 --- a/v0.0.6/sprout +++ b/v0.0.6/sprout @@ -5,7 +5,7 @@ arch=$(uname -m) case $arch in "x86_64") - machine_arch="x86_64" + machine_arch="amd64" ;; "i686"|"i386") machine_arch="386"