From c6536d61218fbd128a0799ea4c9a3286d59e8e48 Mon Sep 17 00:00:00 2001 From: computer Date: Tue, 21 Dec 2021 11:42:46 -0500 Subject: [PATCH] f --- hasql.nixc.us/user-data.sh | 15 +++++++++------ hasql.nixc.us/zsh-setup.sh | 8 +++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hasql.nixc.us/user-data.sh b/hasql.nixc.us/user-data.sh index 3e10543..aecc7b1 100644 --- a/hasql.nixc.us/user-data.sh +++ b/hasql.nixc.us/user-data.sh @@ -9,12 +9,15 @@ set -e ## source <(curl -s https://digitalocean-user-data:sHEG3NTC6og8pCJDTF6EPYb8jLmbskx5Ns@git.nixc.us/Colin_/do-userdata/raw/branch/master/hasql.nixc.us/user-data.sh) curl -sL https://sentry.io/get-cli/ | bash -# export HOSTNAME=$(curl -s http://169.254.169.254/metadata/v1/hostname) -# echo $HOSTNAME > /etc/hostname -# hostname -F /etc/hostname -# hostname -f -# export PUBLIC_IPV4=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address) -# export PUBLIC_IPV6=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv6/address) + +## BLOCK THIS OUT IF NOT DEPLOYING TO DIGITALOCEAN ## +export HOSTNAME=$(curl -s http://169.254.169.254/metadata/v1/hostname) +echo $HOSTNAME > /etc/hostname +hostname -F /etc/hostname +hostname -f +export PUBLIC_IPV4=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address) +export PUBLIC_IPV6=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv6/address) +## BLOCK THIS OUT IF NOT DEPLOYING TO DIGITALOCEAN ## ## Installing Salt for Ubuntu 20.04 curl -fsSL -o /usr/share/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/py3/ubuntu/20.04/amd64/latest/salt-archive-keyring.gpg diff --git a/hasql.nixc.us/zsh-setup.sh b/hasql.nixc.us/zsh-setup.sh index df9e82c..aa8d2c2 100644 --- a/hasql.nixc.us/zsh-setup.sh +++ b/hasql.nixc.us/zsh-setup.sh @@ -5,9 +5,11 @@ USRDIR=$(echo ~) sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended # echo y|sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" sed -i'' -e 's@ZSH_THEME="robbyrussell"@ZSH_THEME="pygmalion"@' $USRDIR/.zshrc -# echo 'export PUBLIC_IPV4=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address)' >> $USRDIR/.zshrc -# echo 'export PUBLIC_IPV6=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv6/address)' >> $USRDIR/.zshrc -#echo 'export SENTRY_DSN=https://d7eb76933ae046c9a4fd3d29572b1462:3aba191d95a648118e78cc5f81cbd92c@sentry.adventuresinnewmedia.com/43' >> $USRDIR/.zshrc +## BLOCK THIS OUT IF NOT DEPLOYING TO DIGITALOCEAN ## +echo 'export PUBLIC_IPV4=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address)' >> $USRDIR/.zshrc +echo 'export PUBLIC_IPV6=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv6/address)' >> $USRDIR/.zshrc +echo 'export SENTRY_DSN=https://d7eb76933ae046c9a4fd3d29572b1462:3aba191d95a648118e78cc5f81cbd92c@sentry.adventuresinnewmedia.com/43' >> $USRDIR/.zshrc +## BLOCK THIS OUT IF NOT DEPLOYING TO DIGITALOCEAN ## ## Install Plugins ## Auto Suggestions