From a5473b700fcb3e7144d39dd47d30d4f123253d70 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Fri, 11 Apr 2025 10:22:34 +0200 Subject: [PATCH] +hostname setting --- install.sh | 16 ++++++++-------- update.sh | 40 +++++++++------------------------------- 2 files changed, 17 insertions(+), 39 deletions(-) diff --git a/install.sh b/install.sh index 491f6ed..a036605 100755 --- a/install.sh +++ b/install.sh @@ -71,7 +71,7 @@ setup_latest_version() { echo "❌ Error: Must be in 'self-host-playbook' directory to setup latest version" echo "Current directory: $(pwd)" return 1 - } + fi echo "⬇️ Downloading version $target_version..." @@ -86,13 +86,13 @@ setup_latest_version() { if ! nix flake clone --quiet "git+https://code.m3tam3re.com/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then echo "❌ Failed to clone repository" return 1 - } + fi # Additional safety check before copying files if [ ! -f "$CLONE_DIR/flake.nix" ]; then echo "❌ Error: Downloaded content doesn't appear to be a valid self-host-playbook" return 1 - } + fi # Copy files from clone to target directory cp -r "$CLONE_DIR"/* "$dir_name/" @@ -107,7 +107,7 @@ setup_from_template() { if [ "$current_dir" != "self-host-playbook" ]; then echo "❌ Error: Must be in 'self-host-playbook' directory" exit 1 - } + fi # Create backup if directory is not empty if [ -n "$(ls -A)" ]; then @@ -294,11 +294,11 @@ SSH_PUB_KEY=$(cat "${SSH_KEY_PATH}.pub") || { echo echo "🔑 Here is your public key:" echo -cat $SSH_KEY_PATH.pub +cat "$SSH_KEY_PATH.pub" echo "" echo "📁 You can also find the keyfile here:" echo -echo $SSH_KEY_PATH.pub +echo "$SSH_KEY_PATH.pub" echo read -p "Press ENTER to continue or CTRL + C to abort..." @@ -323,7 +323,7 @@ read -p " - Domain for Portainer: " PORTAINER_DOMAIN read -p " - Domain for n8n: " N8N_DOMAIN read -p " - Domain for Baserow: " BASEROW_DOMAIN echo -echo "5. How do you authentiate to the target machine?" +echo "6. How do you authenticate to the target machine?" echo "-------------------------------------------" echo " 1) Password" echo " 2) SSH Key" @@ -346,7 +346,7 @@ esac setup_from_template echo -echo "6. Select your cloud provider:" +echo "7. Select your cloud provider:" echo " 1) AWS (Newer instances with NVMe)" echo " 2) AWS (Older instances)" echo " 3) Google Cloud Platform" diff --git a/update.sh b/update.sh index 191c97f..3a0d13f 100644 --- a/update.sh +++ b/update.sh @@ -26,7 +26,7 @@ get_current_version() { } get_latest_version() { - local LATEST_VERSION + local latest_version latest_version=$(curl -s "https://code.m3tam3re.com/api/v1/repos/m3tam3re/self-host-playbook/tags" | jq -r '.[] | select(.name | startswith("v")) | .name' | sort -V | tail -n1) @@ -92,13 +92,13 @@ perform_update() { if [ "$current_dir" != "self-host-playbook" ]; then echo "❌ Error: Must be in 'self-host-playbook' directory" return 1 - } + fi # Verify essential files exist before proceeding if [ ! -f "config.json" ] || [ ! -d "env" ]; then echo "❌ Error: Essential files missing. Are you in the correct directory?" return 1 - } + fi echo "⬇️ Downloading version $target_version..." @@ -113,13 +113,13 @@ perform_update() { if ! nix flake clone --quiet "git+https://code.m3tam3re.com/m3tam3re/self-host-playbook?ref=v${target_version}" --dest "$CLONE_DIR" 2>/dev/null; then echo "❌ Failed to clone repository" return 1 - } + fi # Verify downloaded content if [ ! -f "$CLONE_DIR/flake.nix" ]; then echo "❌ Error: Downloaded content appears invalid" return 1 - } + fi # Remove current directory contents except backup echo "🗑️ Cleaning current directory..." @@ -133,7 +133,7 @@ perform_update() { if [ ! -f "flake.nix" ]; then echo "❌ Error: Failed to copy new version files" return 1 - } + fi # Restore configuration files from backup with validation echo "🔄 Restoring configuration files..." @@ -142,14 +142,14 @@ perform_update() { echo "❌ Error: Failed to restore config.json" return 1 } - } + fi if [ -d "${backup_dir}/env" ]; then cp -r "${backup_dir}/env" . || { echo "❌ Error: Failed to restore env directory" return 1 } - } + fi return 0 } @@ -157,28 +157,24 @@ perform_update() { setup_ssh_config() { local username=$1 local ip_address=$2 - local hostname=$3 # Add hostname parameter + local hostname=$3 local ssh_config_dir="$HOME/.ssh" local ssh_config_file="$ssh_config_dir/config" local ssh_key_file="$ssh_config_dir/self-host-playbook" - # Create .ssh directory if it doesn't exist mkdir -p "$ssh_config_dir" chmod 700 "$ssh_config_dir" - # Create or append to SSH config using hostname as the Host name local config_entry="Host $hostname HostName $ip_address User $username Port 2222 IdentityFile $ssh_key_file" - # Check if entry already exists if ! grep -q "Host $hostname" "$ssh_config_file" 2>/dev/null; then echo -e "\n$config_entry" >> "$ssh_config_file" echo "✅ Added SSH config entry" else - # Update existing entry sed -i.bak "/Host $hostname/,/IdentityFile.*/{ s/HostName.*/HostName $ip_address/ s/User.*/User $username/ @@ -186,7 +182,6 @@ setup_ssh_config() { echo "✅ Updated existing SSH config entry" fi - # Set appropriate permissions chmod 600 "$ssh_config_file" } @@ -195,18 +190,15 @@ update_config_value() { local value=$2 local config_file="config.json" - # Read existing config local config config=$(cat "$config_file") - # Update or add the field if jq -e ".$key" "$config_file" >/dev/null 2>&1; then config=$(echo "$config" | jq --arg key "$key" --arg value "$value" '.[$key] = $value') else config=$(echo "$config" | jq --arg key "$key" --arg value "$value" '. + {($key): $value}') fi - # Write back to file echo "$config" | jq '.' > "$config_file" echo "✅ Updated $key in config.json" } @@ -214,13 +206,11 @@ update_config_value() { install_deploy_rs() { echo "🔧 Installing deploy-rs to user environment..." - # Check if deploy is already installed if command -v deploy >/dev/null 2>&1; then echo "ℹ️ deploy-rs is already installed" return 0 fi - # Install deploy-rs using nix profile if nix profile install 'github:serokell/deploy-rs'; then echo "✅ deploy-rs installed successfully" else @@ -229,12 +219,10 @@ install_deploy_rs() { fi } - # Main script echo "🔄 Self-Host Playbook Update Assistant" echo "======================================" -# Check if we're in the right directory if [ ! -f "config.json" ]; then echo "❌ Error: config.json not found. Please run this script in your self-host-playbook directory." exit 1 @@ -249,33 +237,27 @@ if [ -z "$USERNAME" ]; then exit 1 fi -# If IP address is not in config.json, prompt for it if [ -z "$IP_ADDRESS" ]; then echo "ℹ️ No IP address found in config.json" read -p "Enter the IP address of your server: " IP_ADDRESS - # Validate IP address format if ! [[ $IP_ADDRESS =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "❌ Error: Invalid IP address format" exit 1 fi - # Update config.json with the new IP address update_config_value "ipAddress" "$IP_ADDRESS" fi -# If hostname is not in config.json, prompt for it if [ -z "$HOSTNAME" ]; then echo "ℹ️ No hostname found in config.json" read -p "Enter the hostname for your server: " HOSTNAME - # Validate hostname format (basic validation) if ! [[ $HOSTNAME =~ ^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*$ ]]; then echo "❌ Error: Invalid hostname format" exit 1 fi - # Update config.json with the new hostname update_config_value "hostname" "$HOSTNAME" fi @@ -303,18 +285,14 @@ read -p "Do you want to update to version $LATEST_VERSION? (y/N) " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]]; then - # Create backup backup_dir="backup_${CURRENT_VERSION}_$(date +%Y%m%d_%H%M%S)" echo "📑 Creating backup in $backup_dir..." mkdir -p "$backup_dir" find . -maxdepth 1 ! -name "." ! -name ".." ! -name "$backup_dir" -exec cp -r {} "$backup_dir/" \; - - # Perform update if perform_update "$LATEST_VERSION" "$backup_dir"; then echo echo "✅ Update completed successfully!" - # Setup SSH configuration echo echo "🔧 Setting up SSH configuration..." setup_ssh_config "$USERNAME" "$IP_ADDRESS" "$HOSTNAME"