Browse Source

Merge branch '25-cockpit' into 'master'

cockpit install option

Closes #25

See merge request cyber5k/mistborn!17
merge-requests/18/merge
Steven Foerster 6 years ago
parent
commit
6ac78884f6
  1. 16
      scripts/install.sh

16
scripts/install.sh

@ -37,7 +37,7 @@ if [ $(whoami) != "$MISTBORN_USER" ]; then
sudo cp $FULLPATH /home/$MISTBORN_USER sudo cp $FULLPATH /home/$MISTBORN_USER
sudo chown $MISTBORN_USER:$MISTBORN_USER /home/$MISTBORN_USER/$FILENAME sudo chown $MISTBORN_USER:$MISTBORN_USER /home/$MISTBORN_USER/$FILENAME
sudo SSH_CLIENT="$SSH_CLIENT" MISTBORN_DEFAULT_PASSWORD="$MISTBORN_DEFAULT_PASSWORD" GIT_BRANCH="$GIT_BRANCH" -i -u $MISTBORN_USER bash -c "/home/$MISTBORN_USER/$FILENAME" # self-referential call sudo SSH_CLIENT="$SSH_CLIENT" MISTBORN_DEFAULT_PASSWORD="$MISTBORN_DEFAULT_PASSWORD" GIT_BRANCH="$GIT_BRANCH" MISTBORN_INSTALL_COCKPIT="$MISTBORN_INSTALL_COCKPIT" -i -u $MISTBORN_USER bash -c "/home/$MISTBORN_USER/$FILENAME" # self-referential call
exit 0 exit 0
fi fi
@ -65,6 +65,14 @@ else
echo "MISTBORN_DEFAULT_PASSWORD is already set" echo "MISTBORN_DEFAULT_PASSWORD is already set"
fi fi
# Install Cockpit?
if [ -z "${MISTBORN_INSTALL_COCKPIT}" ]; then
read -p "Install Cockpit (a somewhat resource-heavy system management graphical user interface)? [Y/n]: " MISTBORN_INSTALL_COCKPIT
echo
MISTBORN_INSTALL_COCKPIT=${MISTBORN_INSTALL_COCKPIT:-Y}
fi
# SSH keys # SSH keys
if [ ! -f ~/.ssh/id_rsa ]; then if [ ! -f ~/.ssh/id_rsa ]; then
echo "Generating SSH keypair for $USER" echo "Generating SSH keypair for $USER"
@ -134,7 +142,11 @@ source ./scripts/subinstallers/docker.sh
sudo apt-get install -y unattended-upgrades sudo apt-get install -y unattended-upgrades
# Cockpit # Cockpit
source ./scripts/subinstallers/cockpit.sh if [[ "$MISTBORN_INSTALL_COCKPIT" =~ ^([yY][eE][sS]|[yY])$ ]]
then
# install cockpit
source ./scripts/subinstallers/cockpit.sh
fi
# Mistborn # Mistborn
# final setup vars # final setup vars

Loading…
Cancel
Save