diff --git a/Bash/Proxmox Scripts/Ubuntu Cloud Template/build-templates.sh b/Bash/Proxmox Scripts/Ubuntu Cloud Template/build-templates.sh index 00519b5..12d8826 100755 --- a/Bash/Proxmox Scripts/Ubuntu Cloud Template/build-templates.sh +++ b/Bash/Proxmox Scripts/Ubuntu Cloud Template/build-templates.sh @@ -933,6 +933,10 @@ generate() { done [[ "$ANSIBLE_SSH_PUBKEY" != *"AAAA..."* ]] \ || die "ANSIBLE_SSH_PUBKEY is still the placeholder from shared.conf.example: set your ansible public key in $SHARED_CONF." + [[ "$CI_SSH_KEY" != *""* ]] \ + || die "CI_SSH_KEY still has the placeholder: set your key or GitHub user (or blank it) in $SHARED_CONF." + [[ ! "$WAKATIME_CFG" =~ api_key[[:space:]]*=[[:space:]]*x+[[:space:]]*$ ]] \ + || die "WAKATIME_CFG still has the xxxxxxxx api_key placeholder: set your key (or blank WAKATIME_CFG) in $SHARED_CONF." [[ "$DOTFILES_RAW" != *""* ]] \ || warn "DOTFILES_RAW still has the placeholder: set your dotfiles URL (or blank it) in $SHARED_CONF." check_mail diff --git a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/base.conf.example b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/base.conf.example index 1fdbb76..b7dbd9b 100644 --- a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/base.conf.example +++ b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/base.conf.example @@ -1,6 +1,8 @@ # ============================================================================= # profiles/base.conf - the base template: a server -# Copy to profiles/base.conf and edit. That file is git-ignored. +# ./build-templates.sh --init copies this to profiles/base.conf in your config +# folder (next to shared.conf). Or copy it to profiles/base.conf next to the +# script: *.conf is git-ignored. # # A plain create-ubuntu-cloud-template.sh profile (see profile.conf.example # for every key). build-templates.sh puts the host defaults from shared.conf diff --git a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/desktop.conf.example b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/desktop.conf.example index 9b8a12c..e6f9588 100644 --- a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/desktop.conf.example +++ b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/desktop.conf.example @@ -1,6 +1,8 @@ # ============================================================================= # profiles/desktop.conf - the desktop template: GNOME plus RDP -# Copy to profiles/desktop.conf and edit. That file is git-ignored. +# ./build-templates.sh --init copies this to profiles/desktop.conf in your config +# folder (next to shared.conf). Or copy it to profiles/desktop.conf next to the +# script: *.conf is git-ignored. # # A plain create-ubuntu-cloud-template.sh profile (see profile.conf.example # for every key). build-templates.sh puts the host defaults from shared.conf diff --git a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/extras.conf.example b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/extras.conf.example index 774da1c..458eed1 100644 --- a/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/extras.conf.example +++ b/Bash/Proxmox Scripts/Ubuntu Cloud Template/profiles/extras.conf.example @@ -1,6 +1,8 @@ # ============================================================================= # profiles/extras.conf - the extras template: a server plus admin tools -# Copy to profiles/extras.conf and edit. That file is git-ignored. +# ./build-templates.sh --init copies this to profiles/extras.conf in your config +# folder (next to shared.conf). Or copy it to profiles/extras.conf next to the +# script: *.conf is git-ignored. # # A plain create-ubuntu-cloud-template.sh profile (see profile.conf.example # for every key). build-templates.sh puts the host defaults from shared.conf diff --git a/Bash/Proxmox Scripts/Ubuntu Cloud Template/shared.conf.example b/Bash/Proxmox Scripts/Ubuntu Cloud Template/shared.conf.example index f8a6081..a450fa2 100644 --- a/Bash/Proxmox Scripts/Ubuntu Cloud Template/shared.conf.example +++ b/Bash/Proxmox Scripts/Ubuntu Cloud Template/shared.conf.example @@ -1,7 +1,9 @@ # ============================================================================= # shared.conf - settings for every template built by build-templates.sh -# Copy to shared.conf and fill in. That file is git-ignored: it holds -# passwords and keys. Anything left out keeps the script default. +# ./build-templates.sh --init copies this to ~/.config/ubuntu-templates/ +# shared.conf (outside the git clone). Or copy it to shared.conf next to +# the script: *.conf is git-ignored. It holds passwords and keys. Anything +# left out keeps the script default. # # Per-template VM settings (name, tags, packages, snapd, IPv6, desktop, # RAM, disk) are not here: they live in profiles/