From: Silvio Rhatto Date: Thu, 1 Oct 2020 18:02:47 +0000 (-0300) Subject: Merge commit 'c212514035cffd38acbfac1413064937b28685b6' as 'puppet' X-Git-Tag: v0.99.0~2 X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=765ca2bd25384c3d33d243a5b2f0aa419edcd8fa;p=semanticscuttle.git Merge commit 'c212514035cffd38acbfac1413064937b28685b6' as 'puppet' --- 765ca2bd25384c3d33d243a5b2f0aa419edcd8fa diff --cc puppet/.gitignore index 0000000,0000000..15a8f56 new file mode 100644 --- /dev/null +++ b/puppet/.gitignore @@@ -1,0 -1,0 +1,3 @@@ ++keys ++ssl ++.vagrant diff --cc puppet/.mrconfig index 0000000,06755dd..06755dd mode 000000,100644..100644 --- a/puppet/.mrconfig +++ b/puppet/.mrconfig diff --cc puppet/LICENSE index 0000000,dba13ed..dba13ed mode 000000,100644..100644 --- a/puppet/LICENSE +++ b/puppet/LICENSE diff --cc puppet/Makefile index 0000000,8d77330..8d77330 mode 000000,100644..100644 --- a/puppet/Makefile +++ b/puppet/Makefile diff --cc puppet/README.md index 0000000,9ab8d84..9ab8d84 mode 000000,100644..100644 --- a/puppet/README.md +++ b/puppet/README.md diff --cc puppet/TODO.md index 0000000,650dcf9..650dcf9 mode 000000,100644..100644 --- a/puppet/TODO.md +++ b/puppet/TODO.md diff --cc puppet/Vagrantfile index 0000000,b5cd7f6..b5cd7f6 mode 000000,100644..100644 --- a/puppet/Vagrantfile +++ b/puppet/Vagrantfile diff --cc puppet/bin/copymodules index 0000000,ab5b405..ab5b405 mode 000000,100755..100755 --- a/puppet/bin/copymodules +++ b/puppet/bin/copymodules diff --cc puppet/bin/dependencies index 0000000,3a47a8e..3a47a8e mode 000000,100755..100755 --- a/puppet/bin/dependencies +++ b/puppet/bin/dependencies diff --cc puppet/bin/deploy index 0000000,f23bc42..f23bc42 mode 000000,100755..100755 --- a/puppet/bin/deploy +++ b/puppet/bin/deploy diff --cc puppet/bin/mrconfig index 0000000,41be968..41be968 mode 000000,100755..100755 --- a/puppet/bin/mrconfig +++ b/puppet/bin/mrconfig diff --cc puppet/bin/post-receive index 0000000,e6baa07..e6baa07 mode 000000,100755..100755 --- a/puppet/bin/post-receive +++ b/puppet/bin/post-receive diff --cc puppet/bin/provision index 0000000,99cb862..99cb862 mode 000000,100755..100755 --- a/puppet/bin/provision +++ b/puppet/bin/provision diff --cc puppet/bin/submodules index 0000000,960d290..960d290 mode 000000,100755..100755 --- a/puppet/bin/submodules +++ b/puppet/bin/submodules diff --cc puppet/bin/subtrees index 0000000,19211f1..19211f1 mode 000000,100755..100755 --- a/puppet/bin/subtrees +++ b/puppet/bin/subtrees diff --cc puppet/bin/symlinks index 0000000,a2f27cf..a2f27cf mode 000000,100755..100755 --- a/puppet/bin/symlinks +++ b/puppet/bin/symlinks diff --cc puppet/bin/syncmodules index 0000000,1585aa4..1585aa4 mode 000000,100755..100755 --- a/puppet/bin/syncmodules +++ b/puppet/bin/syncmodules diff --cc puppet/config/common.yaml index 0000000,936420d..936420d mode 000000,100644..100644 --- a/puppet/config/common.yaml +++ b/puppet/config/common.yaml diff --cc puppet/config/hiera.yaml index 0000000,14e393d..14e393d mode 000000,100644..100644 --- a/puppet/config/hiera.yaml +++ b/puppet/config/hiera.yaml diff --cc puppet/config/node/box.example.org.yaml index 0000000,657bce1..657bce1 mode 000000,100644..100644 --- a/puppet/config/node/box.example.org.yaml +++ b/puppet/config/node/box.example.org.yaml diff --cc puppet/files/.empty index 0000000,e69de29..e69de29 mode 000000,100644..100644 --- a/puppet/files/.empty +++ b/puppet/files/.empty diff --cc puppet/files/patches/trusty/puppet-stack-level.md index 0000000,9a3f4d7..9a3f4d7 mode 000000,100644..100644 --- a/puppet/files/patches/trusty/puppet-stack-level.md +++ b/puppet/files/patches/trusty/puppet-stack-level.md diff --cc puppet/files/patches/trusty/puppet-stack-level.patch index 0000000,1d112f7..1d112f7 mode 000000,100644..100644 --- a/puppet/files/patches/trusty/puppet-stack-level.patch +++ b/puppet/files/patches/trusty/puppet-stack-level.patch diff --cc puppet/files/patches/wheezy/collected-resources.md index 0000000,b2ce77d..b2ce77d mode 000000,100644..100644 --- a/puppet/files/patches/wheezy/collected-resources.md +++ b/puppet/files/patches/wheezy/collected-resources.md diff --cc puppet/hiera.yaml index 0000000,31df718..31df718 mode 000000,120000..120000 --- a/puppet/hiera.yaml +++ b/puppet/hiera.yaml diff --cc puppet/kvmxfile index 0000000,0000000..7ab8cef new file mode 100644 --- /dev/null +++ b/puppet/kvmxfile @@@ -1,0 -1,0 +1,98 @@@ ++# ++# Sample kvmx file - https://kvmx.fluxo.info ++# ++ ++# Which base box you should use. Leave unconfigured to use kvmx-create instead. ++#basebox="stretch" ++ ++# First user name ++#user="vagrant" ++user="user" ++ ++# First user password ++#password="vagrant" ++password="user" ++ ++# Set this is you want to be able to share folders between host and guest. ++shared_folder="." ++#shared_folder_mountpoint="/vagrant" ++shared_folder_mountpoint="/srv/kvmx" ++ ++# Folder to sync during provisioning in the format "/host/folder /guest/folder". ++provision_rsync="puppet /etc/puppet" ++ ++# Options for provision_rsync ++provision_rsync_opts="--exclude=.git --exclude=keys --exclude=config/secrets" ++ ++# Absolute path for a provision script located inside the guest. ++provision_command="/etc/puppet/bin/provision && /etc/puppet/bin/deploy" ++ ++# Graphics ++# See https://wiki.archlinux.org/index.php/QEMU#Graphics ++#graphics="-vga std -nographic -vnc :$GUEST_DISPLAY" ++graphics="-vga qxl" ++ ++# VNC Client ++#vnc_client="xtightvncviewer" ++#vnc_client="xvnc4viewer" ++#vnc_client="xvncviewer" ++vnc_client="virt-viewer" ++ ++# Set this if you want to automatically attach an spice client when the machine ++# boots. ++run_spice_client="0" ++ ++# Set additional hostfwd mappings ++#port_mapping="hostfwd=tcp:127.0.0.1:8080-:80,hostfwd=tcp:127.0.0.1:8443-:443" ++ ++# Where the guest image is stored ++#image="$HOME/.local/share/kvmx/$VM/box.img" ++ ++# Image size ++size="10G" ++ ++# Image format: raw or qcow2 ++format="qcow2" ++ ++# Image compression (qcow2 only) ++qcow2_compression="1" ++ ++# Memory ++memory="512" ++ ++# Bootstrap method: custom or vmdeboostrap ++method="custom" ++ ++# Hostname ++hostname="puppet" ++ ++# Domain ++domain="example.org" ++ ++# System arch ++arch="amd64" ++ ++# Box distribution when bootstraping a new image ++version="stretch" ++ ++# Debian mirror ++mirror="http://http.debian.net/debian/" ++ ++# Enables remote administration using SSH. With this configuration enabled, ++# kvmx will be able to administer a running virtual machine using SSH access ++# inside the virtual machine. ++ssh_support="y" ++ ++# Use a custom, per-virtual-machine generated SSH keypair. If you disable this ++# configuration but still want guest administration using SSH, the default ++# insecure keypair will be used. ++# ++# Please note that this setting won't take effect if you're using a basebox. ++# In that case the basebox keypair will be used if it exists, otherwise kvmx ++# fallsback to the default insecure keypair. ++# ++# This setting is used during virtual machine bootstrapping by kvmx-create. ++ssh_custom="y" ++ ++# Bootloader (used only during bootstrapping by kvmx-create). ++bootloader="grub" diff --cc puppet/manifests/nodes/.empty index 0000000,e69de29..e69de29 mode 000000,100644..100644 --- a/puppet/manifests/nodes/.empty +++ b/puppet/manifests/nodes/.empty diff --cc puppet/manifests/nodes/default.pp index 0000000,5ebbf90..5ebbf90 mode 000000,100644..100644 --- a/puppet/manifests/nodes/default.pp +++ b/puppet/manifests/nodes/default.pp diff --cc puppet/modules/.empty index 0000000,e69de29..e69de29 mode 000000,100644..100644 --- a/puppet/modules/.empty +++ b/puppet/modules/.empty diff --cc puppet/puppet index 0000000,945c9b4..945c9b4 mode 000000,120000..120000 --- a/puppet/puppet +++ b/puppet/puppet