From 55bae877ba65234f27ec2db0b7addc3aab305987 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 15 Jan 2022 14:45:10 -0500 Subject: [PATCH] f --- hasql.nixc.us/user-data.sh | 16 ++++++++-------- hasql.nixc.us/zsh-setup.sh | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hasql.nixc.us/user-data.sh b/hasql.nixc.us/user-data.sh index 2246eac..f0bd90e 100644 --- a/hasql.nixc.us/user-data.sh +++ b/hasql.nixc.us/user-data.sh @@ -8,15 +8,15 @@ set -e ## #!/usr/bin/env bash ## 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 +# curl -sL https://sentry.io/get-cli/ | bash ## 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) +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 @@ -35,7 +35,7 @@ wget -qO - https://azlux.fr/repo.gpg.key | sudo apt-key add - ## Installing packages apt-get update apt-get dist-upgrade -y -apt-get install -y asciinema iftop htop glances zsh glusterfs-server glusterfs-client salt-minion docker-ctop +apt-get install -y asciinema iftop htop glances zsh glusterfs-server glusterfs-client salt-minion docker-ctop asciinema ## Install docker-compose and docker using convenience scripts curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose diff --git a/hasql.nixc.us/zsh-setup.sh b/hasql.nixc.us/zsh-setup.sh index de57d71..aa8d2c2 100644 --- a/hasql.nixc.us/zsh-setup.sh +++ b/hasql.nixc.us/zsh-setup.sh @@ -6,9 +6,9 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/too # 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 ## 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 +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