From 8e92cf7db956693b615117ae6ef71a09533d56c9 Mon Sep 17 00:00:00 2001 From: Marcin Engelmann Date: Fri, 19 Jan 2018 17:25:01 +0100 Subject: [PATCH] Add comment-header to files deployed by bootstrap-vz (resolves #429) --- .../common/assets/extlinux/extlinux.conf | 4 ++++ bootstrapvz/common/assets/init.d/expand-root | 20 +++++++++++-------- .../init.d/jessie/generate-ssh-hostkeys | 20 +++++++++++-------- .../init.d/squeeze/generate-ssh-hostkeys | 20 +++++++++++-------- .../assets/init.d/ssh-generate-hostkeys | 2 +- .../init.d/wheezy/generate-ssh-hostkeys | 20 +++++++++++-------- .../common/assets/ssh-generate-hostkeys | 10 +++++++--- bootstrapvz/common/assets/systemd/logind.conf | 3 +++ .../systemd/ssh-generate-hostkeys.service | 4 ++++ bootstrapvz/common/tasks/grub.py | 6 +++++- .../assets/cloud-init/debian_cloud.cfg | 4 ++++ .../docker_daemon/assets/default/docker | 4 ++++ .../docker_daemon/assets/init.d/docker | 4 ++++ .../expand_root/assets/expand-root.service | 4 ++++ .../plugins/expand_root/assets/expand-root.sh | 4 ++++ .../assets/apt-autoremove-suggests | 4 ++++ .../plugins/minimize_size/assets/apt-clean | 4 ++++ .../minimize_size/assets/apt-gzip-indexes | 4 ++++ .../minimize_size/assets/apt-languages | 4 ++++ .../assets/bootstrap-files-filter.sh | 4 ++++ .../minimize_size/assets/bootstrap-script.sh | 3 +++ .../plugins/vagrant/assets/Vagrantfile | 4 ++++ bootstrapvz/providers/ec2/assets/bin/growpart | 4 ++++ .../ec2/53-ec2-network-interfaces.rules | 4 ++++ .../providers/ec2/assets/ec2/ec2dhcp.sh | 4 ++++ .../providers/ec2/assets/ec2/ec2net-functions | 4 ++++ .../providers/ec2/assets/ec2/ec2net.hotplug | 4 ++++ .../providers/ec2/assets/grub.d/40_custom | 3 +++ .../ec2/assets/init.d/ec2-get-credentials | 20 +++++++++++-------- .../ec2/assets/init.d/ec2-run-user-data | 20 +++++++++++-------- .../providers/ec2/assets/sysctl.d/tuning.conf | 4 ++++ .../assets/install_guest_additions.sh | 3 +++ 32 files changed, 173 insertions(+), 53 deletions(-) diff --git a/bootstrapvz/common/assets/extlinux/extlinux.conf b/bootstrapvz/common/assets/extlinux/extlinux.conf index 68ce106..12809f6 100644 --- a/bootstrapvz/common/assets/extlinux/extlinux.conf +++ b/bootstrapvz/common/assets/extlinux/extlinux.conf @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + default l0 prompt 1 timeout 50 diff --git a/bootstrapvz/common/assets/init.d/expand-root b/bootstrapvz/common/assets/init.d/expand-root index ba093f7..3d02a62 100644 --- a/bootstrapvz/common/assets/init.d/expand-root +++ b/bootstrapvz/common/assets/init.d/expand-root @@ -1,13 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: expand-root -# Required-Start: -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Description: Expand the filesystem of the mounted root volume/partition to its maximum possible size +# Provides: expand-root +# Required-Start: +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Description-Short: Expand the filesystem of the mounted root volume/partition to its maximum possible size +# Description: Expand the filesystem of the mounted root volume/partition to its maximum possible size +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO prog=$(basename $0) diff --git a/bootstrapvz/common/assets/init.d/jessie/generate-ssh-hostkeys b/bootstrapvz/common/assets/init.d/jessie/generate-ssh-hostkeys index a913595..364b9fb 100644 --- a/bootstrapvz/common/assets/init.d/jessie/generate-ssh-hostkeys +++ b/bootstrapvz/common/assets/init.d/jessie/generate-ssh-hostkeys @@ -1,13 +1,17 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: generate-ssh-hostkeys -# Required-Start: $local_fs -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: -# Description: Generate ssh host keys if they do not exist +# Provides: generate-ssh-hostkeys +# Required-Start: $local_fs +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: S +# Default-Stop: +# Description-Short: Generate ssh host keys if they do not exist +# Description: Generate ssh host keys if they do not exist. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO prog=$(basename $0) diff --git a/bootstrapvz/common/assets/init.d/squeeze/generate-ssh-hostkeys b/bootstrapvz/common/assets/init.d/squeeze/generate-ssh-hostkeys index 148b87d..099f4e7 100644 --- a/bootstrapvz/common/assets/init.d/squeeze/generate-ssh-hostkeys +++ b/bootstrapvz/common/assets/init.d/squeeze/generate-ssh-hostkeys @@ -1,13 +1,17 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: generate-ssh-hostkeys -# Required-Start: $local_fs -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: -# Description: Generate ssh host keys if they do not exist +# Provides: generate-ssh-hostkeys +# Required-Start: $local_fs +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: S +# Default-Stop: +# Description-Short: Generate ssh host keys if they do not exist +# Description: Generate ssh host keys if they do not exist. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO prog=$(basename $0) diff --git a/bootstrapvz/common/assets/init.d/ssh-generate-hostkeys b/bootstrapvz/common/assets/init.d/ssh-generate-hostkeys index b048555..011e6bc 100644 --- a/bootstrapvz/common/assets/init.d/ssh-generate-hostkeys +++ b/bootstrapvz/common/assets/init.d/ssh-generate-hostkeys @@ -8,7 +8,7 @@ # Default-Stop: # Short-Description: Generate ssh host keys if they do not exist # Description: Generate ssh host keys if they do not exist. -# This is part of bootstrap-vz: http://github.com/andsens/bootstrap-vz +# This file was created by bootstrap-vz. # See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for # legal notices and disclaimers. ### END INIT INFO diff --git a/bootstrapvz/common/assets/init.d/wheezy/generate-ssh-hostkeys b/bootstrapvz/common/assets/init.d/wheezy/generate-ssh-hostkeys index c9efb12..5d11ccc 100644 --- a/bootstrapvz/common/assets/init.d/wheezy/generate-ssh-hostkeys +++ b/bootstrapvz/common/assets/init.d/wheezy/generate-ssh-hostkeys @@ -1,13 +1,17 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: generate-ssh-hostkeys -# Required-Start: $local_fs -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: -# Description: Generate ssh host keys if they do not exist +# Provides: generate-ssh-hostkeys +# Required-Start: $local_fs +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: S +# Default-Stop: +# Description-Short: Generate ssh host keys if they do not exist +# Description: Generate ssh host keys if they do not exist. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO prog=$(basename $0) diff --git a/bootstrapvz/common/assets/ssh-generate-hostkeys b/bootstrapvz/common/assets/ssh-generate-hostkeys index 59c2402..b2486e4 100644 --- a/bootstrapvz/common/assets/ssh-generate-hostkeys +++ b/bootstrapvz/common/assets/ssh-generate-hostkeys @@ -1,13 +1,17 @@ #!/bin/sh +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + +# Generate ssh host keys if they do not exist. +# Output the public keys to the console. This allows user to get host +# keys securely through console log. set -eu prog="$(basename $0)" logger="logger -t ${prog}" -# Output the public keys to the console. -# This allows user to get host keys securely through console log. - echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" | ${logger} for key in ecdsa ed25519 rsa; do keyfile="/etc/ssh/ssh_host_${key}_key" diff --git a/bootstrapvz/common/assets/systemd/logind.conf b/bootstrapvz/common/assets/systemd/logind.conf index b6c4d12..e8c2221 100644 --- a/bootstrapvz/common/assets/systemd/logind.conf +++ b/bootstrapvz/common/assets/systemd/logind.conf @@ -1,3 +1,6 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. [Login] # Disable all TTY getters diff --git a/bootstrapvz/common/assets/systemd/ssh-generate-hostkeys.service b/bootstrapvz/common/assets/systemd/ssh-generate-hostkeys.service index 8204c48..6a59a25 100644 --- a/bootstrapvz/common/assets/systemd/ssh-generate-hostkeys.service +++ b/bootstrapvz/common/assets/systemd/ssh-generate-hostkeys.service @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + [Unit] Description=OpenBSD Secure Shell server Host Key Generation ConditionFileNotEmpty=|!/etc/ssh/ssh_host_ecdsa_key diff --git a/bootstrapvz/common/tasks/grub.py b/bootstrapvz/common/tasks/grub.py index 929e51c..edf03f5 100644 --- a/bootstrapvz/common/tasks/grub.py +++ b/bootstrapvz/common/tasks/grub.py @@ -198,7 +198,11 @@ class WriteGrubConfig(Task): @classmethod def run(cls, info): - grub_config_contents = '' + grub_config_contents = """# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + +""" for key, value in info.grub_config.items(): if isinstance(value, str): grub_config_contents += '{}="{}"\n'.format(key, value) diff --git a/bootstrapvz/plugins/cloud_init/assets/cloud-init/debian_cloud.cfg b/bootstrapvz/plugins/cloud_init/assets/cloud-init/debian_cloud.cfg index 992b775..5fc88dc 100644 --- a/bootstrapvz/plugins/cloud_init/assets/cloud-init/debian_cloud.cfg +++ b/bootstrapvz/plugins/cloud_init/assets/cloud-init/debian_cloud.cfg @@ -1,2 +1,6 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + apt_preserve_sources_list: true manage_etc_hosts: true diff --git a/bootstrapvz/plugins/docker_daemon/assets/default/docker b/bootstrapvz/plugins/docker_daemon/assets/default/docker index b2fc34d..c4c2ca5 100644 --- a/bootstrapvz/plugins/docker_daemon/assets/default/docker +++ b/bootstrapvz/plugins/docker_daemon/assets/default/docker @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # Docker Upstart and SysVinit configuration file # Customize location of Docker binary (especially for development testing). diff --git a/bootstrapvz/plugins/docker_daemon/assets/init.d/docker b/bootstrapvz/plugins/docker_daemon/assets/init.d/docker index 829cab5..725ff6b 100644 --- a/bootstrapvz/plugins/docker_daemon/assets/init.d/docker +++ b/bootstrapvz/plugins/docker_daemon/assets/init.d/docker @@ -12,6 +12,10 @@ # self-sufficient containers from any application. The same container that a # developer builds and tests on a laptop can run at scale, in production, on # VMs, bare metal, OpenStack clusters, public clouds and more. +# +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin diff --git a/bootstrapvz/plugins/expand_root/assets/expand-root.service b/bootstrapvz/plugins/expand_root/assets/expand-root.service index 9b94c7a..0d030d1 100644 --- a/bootstrapvz/plugins/expand_root/assets/expand-root.service +++ b/bootstrapvz/plugins/expand_root/assets/expand-root.service @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + [Unit] Description=Expand the root partition and filesystem on boot After=local-fs.target diff --git a/bootstrapvz/plugins/expand_root/assets/expand-root.sh b/bootstrapvz/plugins/expand_root/assets/expand-root.sh index 96e791d..bdb48df 100755 --- a/bootstrapvz/plugins/expand_root/assets/expand-root.sh +++ b/bootstrapvz/plugins/expand_root/assets/expand-root.sh @@ -1,4 +1,8 @@ #!/bin/bash +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # Expands a partition and filesystem using growpart and an appropriate # filesystem tool for live filesystem expansion. Takes three arguments: # DEVICE, such as "/dev/sda" diff --git a/bootstrapvz/plugins/minimize_size/assets/apt-autoremove-suggests b/bootstrapvz/plugins/minimize_size/assets/apt-autoremove-suggests index 5e47797..6a00266 100644 --- a/bootstrapvz/plugins/minimize_size/assets/apt-autoremove-suggests +++ b/bootstrapvz/plugins/minimize_size/assets/apt-autoremove-suggests @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # Since Docker users are looking for the smallest possible final images, the # following emerges as a very common pattern: # RUN apt-get update \ diff --git a/bootstrapvz/plugins/minimize_size/assets/apt-clean b/bootstrapvz/plugins/minimize_size/assets/apt-clean index f9348ed..e05aa6c 100644 --- a/bootstrapvz/plugins/minimize_size/assets/apt-clean +++ b/bootstrapvz/plugins/minimize_size/assets/apt-clean @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # Since for most Docker users, package installs happen in "docker build" steps, # they essentially become individual layers due to the way Docker handles # layering, especially using CoW filesystems. What this means for us is that diff --git a/bootstrapvz/plugins/minimize_size/assets/apt-gzip-indexes b/bootstrapvz/plugins/minimize_size/assets/apt-gzip-indexes index cdb6621..4465f00 100644 --- a/bootstrapvz/plugins/minimize_size/assets/apt-gzip-indexes +++ b/bootstrapvz/plugins/minimize_size/assets/apt-gzip-indexes @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # Since Docker users using "RUN apt-get update && apt-get install -y ..." in # their Dockerfiles don't go delete the lists files afterwards, we want them to # be as small as possible on-disk, so we explicitly request "gz" versions and diff --git a/bootstrapvz/plugins/minimize_size/assets/apt-languages b/bootstrapvz/plugins/minimize_size/assets/apt-languages index 2d55968..2dd093e 100644 --- a/bootstrapvz/plugins/minimize_size/assets/apt-languages +++ b/bootstrapvz/plugins/minimize_size/assets/apt-languages @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # In Docker, we don't often need the "Translations" files, so we're just wasting # time and space by downloading them, and this inhibits that. For users that do # need them, it's a simple matter to delete this file and "apt-get update". :) diff --git a/bootstrapvz/plugins/minimize_size/assets/bootstrap-files-filter.sh b/bootstrapvz/plugins/minimize_size/assets/bootstrap-files-filter.sh index e061972..4f482c3 100644 --- a/bootstrapvz/plugins/minimize_size/assets/bootstrap-files-filter.sh +++ b/bootstrapvz/plugins/minimize_size/assets/bootstrap-files-filter.sh @@ -1,4 +1,8 @@ #!/bin/sh +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # First we filter out all paths not relating to the stuff we want to filter # After that we take out the paths that we *do* want to keep grep 'EXCLUDE_PATTERN' | grep --invert-match --fixed-strings 'INCLUDE_PATHS' diff --git a/bootstrapvz/plugins/minimize_size/assets/bootstrap-script.sh b/bootstrapvz/plugins/minimize_size/assets/bootstrap-script.sh index 132dee2..d206406 100644 --- a/bootstrapvz/plugins/minimize_size/assets/bootstrap-script.sh +++ b/bootstrapvz/plugins/minimize_size/assets/bootstrap-script.sh @@ -1,4 +1,7 @@ #!/bin/sh +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. # This script does not override anything defined in /usr/share/debootstrap/scripts # Instead we use it to redefine extract_dpkg_deb_data(), so that we may exclude diff --git a/bootstrapvz/plugins/vagrant/assets/Vagrantfile b/bootstrapvz/plugins/vagrant/assets/Vagrantfile index b3164ca..32522bb 100644 --- a/bootstrapvz/plugins/vagrant/assets/Vagrantfile +++ b/bootstrapvz/plugins/vagrant/assets/Vagrantfile @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + Vagrant::Config.run do |config| # This Vagrantfile is auto-generated by `vagrant package` to contain # the MAC address of the box. Custom configuration should be placed in diff --git a/bootstrapvz/providers/ec2/assets/bin/growpart b/bootstrapvz/providers/ec2/assets/bin/growpart index eedcc32..50a97e6 100755 --- a/bootstrapvz/providers/ec2/assets/bin/growpart +++ b/bootstrapvz/providers/ec2/assets/bin/growpart @@ -17,6 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # the fudge factor. if its within this many 512 byte sectors, dont bother FUDGE=${GROWPART_FUDGE:-$((20*1024))} TEMP_D="" diff --git a/bootstrapvz/providers/ec2/assets/ec2/53-ec2-network-interfaces.rules b/bootstrapvz/providers/ec2/assets/ec2/53-ec2-network-interfaces.rules index e9a885c..64dc09e 100644 --- a/bootstrapvz/providers/ec2/assets/ec2/53-ec2-network-interfaces.rules +++ b/bootstrapvz/providers/ec2/assets/ec2/53-ec2-network-interfaces.rules @@ -13,6 +13,10 @@ # specific language governing permissions and limitations under the # License. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + ACTION=="add", SUBSYSTEM=="net", KERNEL=="eth*", IMPORT{program}="/bin/sleep 1" SUBSYSTEM=="net", RUN+="/etc/sysconfig/network-scripts/ec2net.hotplug" diff --git a/bootstrapvz/providers/ec2/assets/ec2/ec2dhcp.sh b/bootstrapvz/providers/ec2/assets/ec2/ec2dhcp.sh index 5f637bc..4391f83 100644 --- a/bootstrapvz/providers/ec2/assets/ec2/ec2dhcp.sh +++ b/bootstrapvz/providers/ec2/assets/ec2/ec2dhcp.sh @@ -15,6 +15,10 @@ # specific language governing permissions and limitations under the # License. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + INTERFACE="${interface}" PREFIX="${new_prefix}" . /etc/sysconfig/network-scripts/ec2net-functions diff --git a/bootstrapvz/providers/ec2/assets/ec2/ec2net-functions b/bootstrapvz/providers/ec2/assets/ec2/ec2net-functions index dcbde75..cf02132 100644 --- a/bootstrapvz/providers/ec2/assets/ec2/ec2net-functions +++ b/bootstrapvz/providers/ec2/assets/ec2/ec2net-functions @@ -15,6 +15,10 @@ # specific language governing permissions and limitations under the # License. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # This file is not a stand-alone shell script; it provides functions # to ec2 network scripts that source it. diff --git a/bootstrapvz/providers/ec2/assets/ec2/ec2net.hotplug b/bootstrapvz/providers/ec2/assets/ec2/ec2net.hotplug index f1de548..54972c1 100644 --- a/bootstrapvz/providers/ec2/assets/ec2/ec2net.hotplug +++ b/bootstrapvz/providers/ec2/assets/ec2/ec2net.hotplug @@ -15,6 +15,10 @@ # specific language governing permissions and limitations under the # License. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + # During init and before the network service is started, metadata is not # available. Exit without attempting to configure the elastic interface. if [ `/sbin/runlevel | /usr/bin/cut -d\ -f2` -ne 5 ]; then diff --git a/bootstrapvz/providers/ec2/assets/grub.d/40_custom b/bootstrapvz/providers/ec2/assets/grub.d/40_custom index d375b2a..d8fe824 100644 --- a/bootstrapvz/providers/ec2/assets/grub.d/40_custom +++ b/bootstrapvz/providers/ec2/assets/grub.d/40_custom @@ -1,4 +1,7 @@ #!/bin/sh +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. # This file generates the old menu.lst configuration with grub2 # It was copied from tomheadys github repo: diff --git a/bootstrapvz/providers/ec2/assets/init.d/ec2-get-credentials b/bootstrapvz/providers/ec2/assets/init.d/ec2-get-credentials index b304ae2..8e18b5c 100644 --- a/bootstrapvz/providers/ec2/assets/init.d/ec2-get-credentials +++ b/bootstrapvz/providers/ec2/assets/init.d/ec2-get-credentials @@ -1,13 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: ec2-get-credentials -# Required-Start: $network -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Description: Retrieve the ssh credentials and add to authorized_keys +# Provides: ec2-get-credentials +# Required-Start: $network +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Description-Short: Retrieve the ssh credentials and add to authorized_keys +# Description: Retrieve the ssh credentials and add to authorized_keys. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO # # ec2-get-credentials - Retrieve the ssh credentials and add to authorized_keys diff --git a/bootstrapvz/providers/ec2/assets/init.d/ec2-run-user-data b/bootstrapvz/providers/ec2/assets/init.d/ec2-run-user-data index 17b8b6f..6e01ae0 100644 --- a/bootstrapvz/providers/ec2/assets/init.d/ec2-run-user-data +++ b/bootstrapvz/providers/ec2/assets/init.d/ec2-run-user-data @@ -1,13 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: ec2-run-user-data -# Required-Start: ec2-get-credentials -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Description: Run instance user-data if it looks like a script. +# Provides: ec2-run-user-data +# Required-Start: ec2-get-credentials +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Description-Short: Run instance user-data if it looks like a script +# Description: Run instance user-data if it looks like a script. +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. ### END INIT INFO # # Only retrieves and runs the user-data script once per instance. If diff --git a/bootstrapvz/providers/ec2/assets/sysctl.d/tuning.conf b/bootstrapvz/providers/ec2/assets/sysctl.d/tuning.conf index 3090b76..e1a85da 100644 --- a/bootstrapvz/providers/ec2/assets/sysctl.d/tuning.conf +++ b/bootstrapvz/providers/ec2/assets/sysctl.d/tuning.conf @@ -1,3 +1,7 @@ +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. + vm.swappiness = 0 vm.dirty_ratio = 80 vm.dirty_background_ratio = 5 diff --git a/bootstrapvz/providers/virtualbox/assets/install_guest_additions.sh b/bootstrapvz/providers/virtualbox/assets/install_guest_additions.sh index 3774c5d..5b4b112 100644 --- a/bootstrapvz/providers/virtualbox/assets/install_guest_additions.sh +++ b/bootstrapvz/providers/virtualbox/assets/install_guest_additions.sh @@ -1,4 +1,7 @@ #!/bin/bash +# This file was created by bootstrap-vz. +# See https://github.com/andsens/bootstrap-vz/blob/master/LICENSE for +# legal notices and disclaimers. function uname { if [[ $1 == '-r' ]]; then