Merge pull request #22 from 45Drives/dev-hutch

Update deploy-minio.sh
Updated script to add the MC tool and create an MC alias for Minio commands

Author: bkelly16

deploy-minio.sh

@@ -2,6 +2,7 @@
 
 # Matthew Hutchinson <mhutchinson@45drives.com>
 
+if [ $EUID -ne 0 ]; then echo "Must be run as root!" >&2 exit 2 fi
 
 set -e
 
@@ -21,67 +22,79 @@ OS=$(cat /etc/os-release | grep -w NAME)
 # Update system
 echo "[1/10] Updating system..."
 if [ "$OS" == 'NAME="Ubuntu"' ]; then
-    sudo apt update && sudo apt upgrade -y
+    apt update && apt upgrade -y
     PM=apt
 elif [ "$OS" == 'NAME="Rocky Linux"' ]; then
-    sudo dnf update -y
+    dnf update -y
     PM=dnf
 else
     echo "Unsupported package manager. Please use a system with DNF or APT."
     exit 1
 fi
 
 echo "[2/10] Creating minio user..."
-sudo useradd -r minio-user -s /sbin/nologin || echo "User already exists."
+useradd -r minio-user -s /sbin/nologin || echo "User already exists."
 
 echo "[3/10] Installing wget..."
-sudo $PM install -y wget
+$PM install -y wget
 
 echo "[4/10] Downloading and setting up MinIO binary..."
-sudo wget https://dl.min.io/community/server/minio/release/linux-amd64/archive/minio.RELEASE.2025-04-22T22-12-26Z -O /usr/local/bin/minio
-sudo chmod +x /usr/local/bin/minio
+wget https://dl.min.io/community/server/minio/release/linux-amd64/archive/minio.RELEASE.2025-04-22T22-12-26Z -O /usr/local/bin/minio
+chmod +x /usr/local/bin/minio
 
 echo "[5/10] Creating ZFS filesystem ${POOL_NAME}/minio..."
 
-if sudo zfs list ${POOL_NAME}/minio &>/dev/null; then
-    echo "❗ The ZFS dataset ${POOL_NAME}/minio already exists."
-    read -p "Do you want to delete and recreate it? This will erase all data in it. (y/n): " RECREATE
-    if [[ "$RECREATE" == "y" ]]; then
-        echo "Destroying existing dataset ${POOL_NAME}/minio..."
-        sudo zfs destroy -r ${POOL_NAME}/minio
-        echo "Creating new dataset ${POOL_NAME}/minio..."
-        sudo zfs create -o recordsize=1M -o atime=off -o xattr=sa -o compression=lz4 ${POOL_NAME}/minio
-    elif [[ "$RECREATE" == "n" ]]; then
-        read -p "Do you want to deploy on top of existing data? (y/n): " REUSE
-        if [[ "$REUSE" == "y" ]]; then
-            echo "Reusing existing dataset ${POOL_NAME}/minio..."
-        else
-            echo "Exiting"
-            exit 1
-        fi
-    else
-        echo "Invalid option. Exiting."
-        exit 1
+# Ensure pool exists
+if ! zpool list -H -o name | grep -qx "${POOL_NAME}"; then
+  echo "ERROR: ZFS pool '${POOL_NAME}' not found. Pools available:"
+  zpool list
+  exit 1
+fi
+
+DATASET="${POOL_NAME}/minio"
+
+# Existence check with timeout so it cannot "stick"
+if timeout 10s zfs list -H -o name "$DATASET" >/dev/null 2>&1; then
+  echo "WARNING: The ZFS dataset $DATASET already exists."
+  read -p "Do you want to delete and recreate it? This will erase all data in it. (y/n): " RECREATE
+  if [[ "$RECREATE" == "y" ]]; then
+    echo "Destroying existing dataset $DATASET..."
+    zfs destroy -r "$DATASET"
+    echo "Creating new dataset $DATASET..."
+    zfs create -o recordsize=1M -o atime=off -o xattr=sa -o compression=lz4 "$DATASET"
+  elif [[ "$RECREATE" == "n" ]]; then
+    read -p "Do you want to deploy on top of existing data? (y/n): " REUSE
+    if [[ "$REUSE" != "y" ]]; then
+      echo "Exiting"
+      exit 1
     fi
+  else
+    echo "Invalid option. Exiting."
+    exit 1
+  fi
 else
-    echo "Creating new dataset ${POOL_NAME}/minio..."
-    sudo zfs create -o recordsize=1M -o atime=off -o xattr=sa -o compression=lz4 ${POOL_NAME}/minio
+  rc=$?
+  if [ "$rc" -eq 124 ]; then
+    echo "ERROR: ZFS command timed out. ZFS may be unhealthy or blocked."
+    echo "Try: zpool status ; dmesg -T | tail -n 200 | grep -i zfs"
+    exit 1
+  fi
+  echo "Creating new dataset $DATASET..."
+  zfs create -o recordsize=1M -o atime=off -o xattr=sa -o compression=lz4 "$DATASET"
 fi
 
 
-
-
 echo "[6/10] Setting ownership for ZFS mount..."
-sudo chown -R minio-user:minio-user /${POOL_NAME}/minio/
+chown -R minio-user:minio-user /${POOL_NAME}/minio/
 
 echo "[7/10] Creating and setting permissions for config directories..."
-sudo mkdir -p /etc/minio/certs
-sudo touch /etc/minio/credentials
-sudo chown -R minio-user:minio-user /etc/minio/
-sudo chmod 600 /etc/minio/credentials
+mkdir -p /etc/minio/certs
+touch /etc/minio/credentials
+chown -R minio-user:minio-user /etc/minio/
+chmod 600 /etc/minio/credentials
 
 echo "[8/10] Creating default config at /etc/default/minio..."
-sudo bash -c "cat > /etc/default/minio" <<EOF
+bash -c "cat > /etc/default/minio" <<EOF
 # MinIO Configuration
 MINIO_VOLUMES="/${POOL_NAME}/minio/"
 MINIO_ACCESS_KEY="${ACCESS_KEY}"
@@ -90,33 +103,33 @@ MINIO_CERTS_DIR="/etc/minio/certs"
 EOF
 
 echo "[9/10] Creating credentials file..."
-sudo bash -c "cat > /etc/minio/credentials" <<EOF
+bash -c "cat > /etc/minio/credentials" <<EOF
 MINIO_ROOT_USER=${MINIO_USER}
 MINIO_ROOT_PASSWORD=${MINIO_PASSWORD}
 EOF
 
 echo "[10/10] Setting firewall rule for port 7575..."
 if command -v firewall-cmd &>/dev/null; then
-    sudo firewall-cmd --zone=public --add-port=7575/tcp --permanent || true
-    sudo firewall-cmd --reload || true
+    firewall-cmd --zone=public --add-port=7575/tcp --permanent || true
+    firewall-cmd --reload || true
 else
     echo "firewalld not found, skipping firewall configuration."
 fi
 
 read -p "Do you want to create self-signed HTTPS certs? (y/n): " USE_SSL
 if [[ "$USE_SSL" == "y" ]]; then
     echo "Installing OpenSSL and generating certs..."
-    sudo $PM install -y openssl
-    sudo openssl genrsa -out /etc/minio/certs/private.key 2048
-    sudo openssl req -new -x509 -key /etc/minio/certs/private.key -out /etc/minio/certs/public.crt -days 3650
-    sudo chown -R minio-user:minio-user /etc/minio/certs
-    sudo chmod 600 /etc/minio/certs/private.key
+    $PM install -y openssl
+    openssl genrsa -out /etc/minio/certs/private.key 2048
+    openssl req -new -x509 -key /etc/minio/certs/private.key -out /etc/minio/certs/public.crt -days 3650
+    chown -R minio-user:minio-user /etc/minio/certs
+    chmod 600 /etc/minio/certs/private.key
 else 
 echo -e "\033[1;36mPlace SSL certs in \"/etc/minio/certs\" for custom certificates\033[0m"
 fi
 
 echo "Creating systemd service for MinIO..."
-sudo bash -c "cat > /etc/systemd/system/minio.service" <<'EOF'
+bash -c "cat > /etc/systemd/system/minio.service" <<'EOF'
 [Unit]
 Description=MinIO
 Documentation=https://docs.min.io
@@ -151,8 +164,54 @@ EOF
 
 
 echo "Enabling and starting MinIO service..."
-sudo systemctl daemon-reload
-sudo systemctl enable --now minio
+systemctl daemon-reload
+systemctl enable --now minio
+
+echo "Installing MinIO client (mc)..."
+$PM install -y curl
+curl -fL https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/local/bin/mc
+chmod +x /usr/local/bin/mc
+
+MC_BIN="/usr/local/bin/mc"
+if [[ ! -x "$MC_BIN" ]]; then
+  echo "ERROR: mc not found or not executable at $MC_BIN"
+  ls -l "$MC_BIN" || true
+  exit 1
+fi
+
+
+# Determine scheme: https if cert exists, else http
+SCHEME="http"
+if [[ -f /etc/minio/certs/public.crt ]]; then
+  SCHEME="https"
+
+  echo "Trusting MinIO certificate (self-signed)..."
+  if [[ "$OS" == 'NAME="Rocky Linux"' ]]; then
+    cp /etc/minio/certs/public.crt /etc/pki/ca-trust/source/anchors/minio.crt
+    update-ca-trust
+  elif [[ "$OS" == 'NAME="Ubuntu"' ]]; then
+    cp /etc/minio/certs/public.crt /usr/local/share/ca-certificates/minio.crt
+    update-ca-certificates
+  fi
+fi
+
+echo "Waiting for MinIO to become ready..."
+for i in {1..60}; do
+  if curl -fsS -k "${SCHEME}://127.0.0.1:9000/minio/health/ready" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+
+echo "Creating mc alias houston (for root)..."
+ "$MC_BIN" alias set houston "${SCHEME}://127.0.0.1:9000" "${MINIO_USER}" "${MINIO_PASSWORD}"
+
+echo "Verifying MinIO admin access via mc..."
+ "$MC_BIN" --json admin info houston >/dev/null
+
+echo "mc alias houston created and verified."
+
 
 echo "=== Setup Complete ==="
 echo "Visit https://YOUR_SERVER_IP:7575 to access the MinIO console."
+