pupistry 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365e155d4398495ffc9b79178244a48c2772114b
-  data.tar.gz: fbb179ef527112d00b9a8d0abc800ae155f9a7b6
+  metadata.gz: 3592a1a26670a659f59808e3cee82a64852e43bf
+  data.tar.gz: 2c38660daaa902a4f82353405ef3cc06be17297a
 SHA512:
-  metadata.gz: 965e106b6a27a882a630ba5c7c9eccafc7237c34079e387c7df5fa82e6a1896c75f31cc97a90b68bb0a790690d502003b47976e22e0b3e37408155e95c7e1081
-  data.tar.gz: b6b3a81e24e7130e63177f6f1f82948efaac836e690cf25d8e21549308f40cdf81e9bb8ac8c711a0e08e5e1bca3a4f7eaf6051f86dec71623810219c32f86fc6
+  metadata.gz: 696c60d351a9aa13e736301286fdc4f8d7411fe079b73944ebb4a8ed8519716ada4031b9efa3ebb18159160743e6e70fb4277e35e652f7aca34338fe77f28cb3
+  data.tar.gz: 375d678d998288c046c3fe8fbc429a8ffc11a649a5000bc1ba2246382b011e6c292e773434e467bc7d3027840bf7b2aea06bccb74aefbd40f77edc9b857e4b80

data/README.md

@@ -3,14 +3,14 @@
 [![Build Status](https://travis-ci.org/jethrocarr/pupistry.svg)](https://travis-ci.org/jethrocarr/pupistry)
 
 Pupistry (puppet + artistry) is a solution for implementing reliable and secure
-masterless puppet deployments by taking Puppet modules assembled by r10k and
-generating compresed and signed archives for distribution to the masterless
+masterless puppet deployments by taking Puppet modules assembled by `r10k` and
+generating compressed and signed archives for distribution to the masterless
 servers.
 
-Pupistry builds on the functionality offered by the r10k workflow but rather
+Pupistry builds on the functionality offered by the `r10k` workflow but rather
 than requiring the implementing of site-specific custom bootstrap and custom
-workflow mechanisms, Pupistry executes r10k, assembles the combined modules
-and then generates a compress artifact file. It then optionally signs the
+workflow mechanisms, Pupistry executes `r10k`, assembles the combined modules
+and then generates a compressed artifact file. It then optionally signs the
 artifact with GPG and finally uploads it into an Amazon S3 bucket along with a
 manifest file.
 
@@ -30,12 +30,12 @@ Masterless Puppet is a great solution for anyone wanting to avoid scaling issues
 and risk of centralised failure due to a central Puppet master, but it does bring
 a number of issues with it.
 
-1. Having to setup deployer keys to every git repo used is a maintainance headache. Pupistry means only your workstation needs access, which presumably will have access to most/all repos already.
-2. Your system build success is dependent on all the git repos you've used, including any third parties that could vanish. A single missing or broken repo could prevent autoscaling or new machine builds at a critical time. Pupistry's use of artifact files prevents surprises - if you can hit S3, you're sorted.
+1. Having to setup deployer keys to every Git repo used is a maintainance headache. Pupistry means only your workstation needs access, which presumably will have access to most/all repos already.
+2. Your system build success is dependent on all the Git repos you've used, including any third parties that could vanish. A single missing or broken repo could prevent autoscaling or new machine builds at a critical time. Pupistry's use of artifact files prevents surprises - if you can hit S3, you're sorted.
 3. It is easy for malicious code in the third party repos to slip in without noticing. Even if the author themselves is honest, not all repos have proper security like two-factor. Pupistry prevents surprise updates of modules and also has an easy diff feature to see what changed since you last generated an artifact.
-4. Puppet masterless tends to be implemented in many different ways using everyone's own hacky scripts. Pupistry's goal is to create a singular standard/approach to masterless, in the same way that r10k created a standard approach to git-based Puppet workflows. And this makes things easy - install Pupistry, add the companion Puppet module and run the bootstrap script. Easy!
-5. No dodgy cronjobs running r10k and Puppet in weird ways. A simple clean agent with daemon or run-once functionality.
-6. Performance - Go from 30+ seconds r10k update checks to 2 second Pupistry update checks. And when there is a change, it's a fast efficent compressed file download from S3 rather than pulling numerious git repos.
+4. Puppet masterless tends to be implemented in many different ways using everyone's own hacky scripts. Pupistry's goal is to create a singular standard approach to masterless, in the same way that `r10k` created a standard approach to Git-based Puppet workflows. And this makes things easy - install Pupistry, add the companion Puppet module and run the bootstrap script. Easy!
+5. No dodgy cronjobs running `r10k` and Puppet in weird ways. A simple clean agent with daemon or run-once functionality.
+6. Performance - Go from 30+ seconds `r10k` update checks to 2 second Pupistry update checks. And when there is a change, it's a fast efficent compressed file download from S3 rather than pulling numerious Git repos.
 
 
 
@@ -66,8 +66,8 @@ Build a new artifact:
     Tip: Run pupistry diff to see what changed since the last artifact version
 
 
-Note that artifact builds are done from the upstream git repos, so if you
-have made changes, remember to git push first before generating. The tool will
+Note that artifact builds are done from the upstream Git repos, so if you
+have made changes, remember to `git push` first before generating. The tool will
 remind you if it detects nothing has changed since the last run.
 
 Once your artifact is built, you can double check what has changed in the
@@ -141,7 +141,7 @@ with AWS, you can make it part of the stack itself.
 
 These bootstraps aren't mandatory, if you prefer a different approach you can
 use these as an example and write your own - generally the essential bit is to
-get puppet installed, get pupistry (and deps to build it's gems) installed and
+get puppet installed, get pupistry (and deps to build its gems) installed and
 write the config before finally executing your first Pupistry/Puppet run.
 
 If using AWS and IAM Roles feature, it is acceptable for access_key_id and
@@ -151,12 +151,12 @@ account with read-only access to the configured S3 bucket!
 
 ## Running Puppet on target nodes
 
-Pupistry replaces the need to call Puppet directly. Instead, call Pupistry with
-and it will handle getting the artifact and then executing Puppet for you. It
+Pupistry replaces the need to call Puppet directly. Instead, call Pupistry and
+it will handle getting the artifact and then executing Puppet for you. It
 respects some parameters like --environment and --noop for easy testing of new
 manifests and modules.
 
-At it's simpliest, to apply the current Puppet manifests:
+At its simplest, to apply the current Puppet manifests:
 
     $ pupistry apply
     I, [2015-04-10T00:44:40.623101 #6726]  INFO -- : Pulling latest artifact....
@@ -258,7 +258,7 @@ Once status is CREATE_COMPLETE, you can get all the outputs from the stack with:
 
     aws cloudformation describe-stacks --query "Stacks[*].Outputs[*]" --stack-name pupistry-resources-changeme
 
-You now need to edit `~/.pupistry/settings.yaml` and enter in the equalivent
+You now need to edit `~/.pupistry/settings.yaml` and enter in the equivalent
 OutputValue for the following labels:
 
     general:
@@ -281,16 +281,16 @@ OutputValue for the following labels:
 
 ### Puppet Code Structure
 
-The following is the expected minmum structure of the Puppetcode repository to
+The following is the expected minimum structure of the Puppetcode repository to
 enable it to work with Pupistry:
 
     /Puppetfile
     /hiera.yaml
     /manifests/site.pp
 
-Puppetfile is standard r10k and site.pp is standard Puppet. The Hiera config
+`Puppetfile` is standard `r10k` and `site.pp` is standard Puppet. The Hiera config
 is generally normal, but you do need to define a datadir to tell Puppet to look
-where the puppetcode gets unpacked to. Generally the following sample Hiera
+where the puppet code gets unpacked to. Generally the following sample Hiera
 will do the trick:
 
     ---
@@ -312,7 +312,7 @@ the `datadir` parameter in Hiera to a fixed path and the `puppetcode` parameter
 in Pupistry to be the exact same value, since `%{::settings::confdir}` will
 differ between Pupistry and masterful Puppet.
 
-Pupistry will default to applying the "master" branch if one is not listed, if
+Pupistry will default to applying the `master` branch if one is not listed, if
 you are doing branch-based environments, you can specifiy when bootstrapping
 and override on a per-execution basis with `--environment`.
 
@@ -320,11 +320,11 @@ You'll notice pretty quickly if something is broken when doing `pupistry apply`
 
 Confused? No worried, check out the sample repo that shows a very simple setup.
 You can copy this and start your own Puppet adventure, just add in your modules
-to Puppetfile and add them to the relevent machines in manifests/site.pp.
+to `Puppetfile` and add them to the relevant machines in `manifests/site.pp`.
 
 https://github.com/jethrocarr/pupistry-samplepuppet 
 
-TODO: Longer term intend to add support for various popular structure, but
+TODO: Longer term intend to add support for various popular structures, but
 for now it is what it is. It's not hard, check out bin/puppistry and send
 pull requests.
 
@@ -342,9 +342,9 @@ operation.
 You can fetch the module from:
 https://github.com/jethrocarr/puppet-pupistry
 
-If you're doing r10k and Puppet masterless from scratch, this is probably
-something you want to make life easy. With r10k, just add the following to your
-Puppetfile:
+If you're doing `r10k` and Puppet masterless from scratch, this is probably
+something you want to make life easy. With `r10k`, just add the following to your
+`Puppetfile`:
 
     # Install the Pupistry companion module
     mod 'jethrocarr/pupistry'
@@ -361,7 +361,7 @@ And include the pupistry module in all your systems:
     }
 
 
-## 4. Building you first node (Bootstrapping)
+## 4. Building your first node (Bootstrapping)
 
 No need for manual configuration of your servers/nodes, you just need to build
 your first artifact with Pupistry (`pupistry build && pupistry push`) and then
@@ -383,7 +383,7 @@ skills to make your node actually do something useful. :-)
 
 ## 5. (optional) Baking an image with Packer
 
-Note that the node initialisation process is still susceptable to weaknesses
+Note that the node initialisation process is still susceptible to weaknesses
 such as a bug in a new version of Puppet or Pupistry, or changes to the OS
 packages. If this is a concern/issue for you and you want complete reliability,
 then use the user data to build a host pre-loaded with Puppet and Pupistry and
@@ -429,7 +429,7 @@ https://www.jethrocarr.com/2015/05/10/setting-up-and-using-pupistry
 
 By following this tutorial you can go from nothing, to having a complete up
 and running masterless Puppet environment using Pupistry. It covers the very
-basics of setting up your r10k environment.
+basics of setting up your `r10k` environment.
 
 
 # GPG Notes
@@ -457,7 +457,7 @@ would be from you accidentally sharing your IAM credentials in the wrong place,
 or an exploited build server.
 
 
-# Securing Hirea with HieraCrypt
+# Securing Hiera with HieraCrypt
 
 In a standard Puppet master situation, the Puppet master parses the Hiera data
 and then passes only the values that apply to a particular host to it. But with
@@ -511,7 +511,7 @@ against their key.
 
 ## Use r10k
 
-Currently only an r10k workflow is supported. Pull requests for others (eg
+Currently only an `r10k` workflow is supported. Pull requests for others (eg
 Librarian Puppet) are welcome, but it's not a priority for this author as r10k
 is working nicely.
 
@@ -536,7 +536,7 @@ Please see resources/bootstrap/BOOTSTRAP_NOTES.md for more details on how to
 write and debug bootstrap templates.
 
 
-## Continious Deployment
+## Continuous Deployment
 
 A lot of what Pupistry does can also be accomplished by various home-grown
 Continious Deployment (CD) solutions using platforms like Jenkins or Bamboo. CD
@@ -566,7 +566,7 @@ author.
 
 # Developing
 
-When developing Pupistry, you can run the git repo copy with:
+When developing Pupistry, you can run the Git repo copy with:
 
     gem install bundler
     bundle install

data/lib/pupistry/artifact.rb

@@ -425,7 +425,7 @@ module Pupistry
         tar = Pupistry::Config.which_tar
         $logger.debug "Using tar at #{tar}"
 
-        if system "#{tar} -xf ../artifact.#{@checksum}.tar.gz"
+        if system "#{tar} -xzf ../artifact.#{@checksum}.tar.gz"
           $logger.debug "Successfully unpacked artifact #{@checksum}"
         else
           $logger.error "Unable to unpack artifact files to #{Dir.pwd}"

data/lib/pupistry/hieracrypt.rb

@@ -152,6 +152,10 @@ module Pupistry
                   if puppet_facts['environment'] == nil
                     puppet_facts['environment'] = env
                   end
+
+                  if puppet_facts['environment'] == ""
+                    puppet_facts['environment'] = env
+                  end
                 end
 
                 
@@ -202,12 +206,16 @@ module Pupistry
 
                 hiera_rules.each do |rule|
                   for file in Dir.glob("hieradata/#{rule}.*")
-                    $logger.debug " - #{file}"
-
-                    file_rel = file.sub("hieradata/", "")
-                    #FileUtils.mkdir_p  "hieracrypt.#{node}/#{File.dirname(file_rel)}"
-                    FileUtils.mkdir_p  "hieracrypt.#{node}/#{File.dirname(file_rel)}"
-                    FileUtils.cp file, "hieracrypt.#{node}/#{file_rel}"
+                    if /\/\.\.?$/.match(file)
+                      # If we end up with /. or /.. in the glob, exclude.
+                      $logger.debug " - Excluding invalid file #{file}"
+                    else
+                      $logger.debug " - #{file}"
+
+                      file_rel = file.sub("hieradata/", "")
+                      FileUtils.mkdir_p  "hieracrypt.#{node}/#{File.dirname(file_rel)}"
+                      FileUtils.cp file, "hieracrypt.#{node}/#{file_rel}"
+                    end
                   end
                 end
 

data/lib/pupistry/storage_aws.rb

@@ -42,7 +42,15 @@ module Pupistry
       end
 
       # Setup S3 bucket
-      @s3     = AWS::S3.new
+      if defined? $config['general']['s3_endpoint'] and $config['general']['s3_endpoint'] != nil
+        $logger.debug 'Connecting to alternative endpoint ' + $config['general']['s3_endpoint']
+        @s3 = AWS::S3.new(
+	        s3_endpoint: $config['general']['s3_endpoint'],
+	        s3_force_path_style: true,
+	      )
+      else
+        @s3 = AWS::S3.new
+      end
       @bucket = @s3.buckets[$config[mode]['s3_bucket']]
     end
 

data/lib/pupistry/version.rb

@@ -1,3 +1,3 @@
 module Pupistry
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/resources/aws/README_AWS.md

@@ -14,7 +14,7 @@ enter your specific details (like desired bucket name) and it will go and build
 a complete setup of the AWS resources needed for using Pupistry that is
 suitable for most end users.
 
-Altneratively if you have complex requirements, feel free to incorporate the
+Alternatively, if you have complex requirements, feel free to incorporate the
 ideas and examples of this stack into your own design.
 
 Building the stack (simple):
@@ -42,8 +42,8 @@ Make sure the stack has finished building/is built:
 
     aws cloudformation describe-stacks --query "Stacks[*].StackStatus" --stack-name pupistry-resources
 
-Status should be "COMPLETE", if it is set to "ROLLBACK" then it has failed to
-build. If set to "CREATE_IN_PROGRESS" then you need to give it more time.
+Status should be `COMPLETE`, if it is set to `ROLLBACK` then it has failed to
+build. If set to `CREATE_IN_PROGRESS` then you need to give it more time.
 
 
 Fetching details from the stack:

data/resources/bootstrap/BOOTSTRAP_NOTES.md

@@ -17,15 +17,15 @@ DO:
 DON'T:
 
 * Use third party respositories or download sites, it needs to be stock vendor OS and packages.
-* Execute code from third party sites (eg no wget http://example.com/malware/myscript.sh)
+* Execute code from third party sites (eg no `wget http://example.com/malware/myscript.sh`)
 * Tie user data to any particular cloud provider unless unavoidable for that platform.
 * Make the script any more complex than it needs to be.
 
 
 # Examples
 
-See the "centos-7" or "ubuntu-14.04" templates for examples on how the bootstrap
-templates should be written. The "fedora-any" template also shows an example of
+See the `centos-7` or `ubuntu-14.04` templates for examples on how the bootstrap
+templates should be written. The `fedora-any` template also shows an example of
 dealing with networking not being ready and also how to handle frequently
 changing distribution versions.
 

data/resources/bootstrap/fedora-any.erb

@@ -10,11 +10,8 @@
 # make sure the network is ready before starting to try and downlod stuff!
 t=300; c=0; r=0; until ping -c 1 www.google.com >/dev/null 2>&1 || ((++c >= t)); do r=$?; echo "Waiting for network... ($r)"; done
 
-yum install --assumeyes redhat-lsb-core
-rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-fedora-`lsb_release -sr`.noarch.rpm
-
 yum update --assumeyes
-yum install --assumeyes puppet ruby-devel rubygems gcc zlib-devel libxml2-devel patch gnupg
+yum install --assumeyes puppet ruby-devel rubygems gcc zlib-devel libxml2-devel patch gnupg redhat-rpm-config
 
 gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry

data/resources/bootstrap/openbsd-6.0.erb

@@ -0,0 +1,53 @@
+#!/bin/ksh
+
+echo \
+ 'installpath = http://YOURMIRRORHERE/pub/OpenBSD/%c/packages/%a/' \
+ > /etc/pkg.conf
+
+# need iconv for nokogiri gem build
+pkg_add ruby-2.3.1p2 libiconv
+ln -sf /usr/local/bin/ruby23 /usr/local/bin/ruby
+ln -sf /usr/local/bin/erb23 /usr/local/bin/erb
+ln -sf /usr/local/bin/irb23 /usr/local/bin/irb
+ln -sf /usr/local/bin/rdoc23 /usr/local/bin/rdoc
+ln -sf /usr/local/bin/ri23 /usr/local/bin/ri
+ln -sf /usr/local/bin/rake23 /usr/local/bin/rake
+ln -sf /usr/local/bin/gem23 /usr/local/bin/gem
+
+# modify RubyGems defaults so gem executables don't all get names
+# like thor23 and puppet23 and pupistry23 because frankly this
+# sucks and the alternative (moar symlinks) sucks even more
+osdefaults_path=/usr/local/lib/ruby/2.3/rubygems/defaults
+mkdir -p $osdefaults_path
+cat > $osdefaults_path/operating_system.rb << "OSDEFAULTSRB"
+module Gem
+  def self.default_exec_format
+    '%s'
+  end
+end
+OSDEFAULTSRB
+
+gem install puppet pupistry --no-ri --no-rdoc
+
+mkdir -p /etc/pupistry
+mkdir -p <%= puppetcode %>
+cat > /etc/pupistry/settings.yaml << "EOF"
+general:
+  app_cache: ~/.pupistry/cache
+  s3_bucket: <%= s3_bucket %>
+  s3_prefix: <%= s3_prefix %>
+  gpg_disable: <%= gpg_disable %>
+  gpg_signing_key: <%= gpg_signing_key %>
+agent:
+  puppetcode: <%= puppetcode %>
+  access_key_id: <%= access_key_id %>
+  secret_access_key: <%= secret_access_key %>
+  region: <%= region %>
+  proxy_uri: <%= proxy_uri %>
+  daemon_frequency: <%= daemon_frequency %>
+  daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
+EOF
+chmod 700 /etc/pupistry/settings.yaml
+chmod 700 <%= puppetcode %>
+pupistry apply --verbose

data/resources/bootstrap/ubuntu-16.04-puppet4.erb

@@ -0,0 +1,48 @@
+#!/bin/bash -x
+# Bootstrap for Ubuntu 16.04 LTS (Xenial)
+# This version of the bootstrap file uses the upstream Puppet 4 series from
+# Puppetlabs, which differs from Puppet 3.8 series supplied with Ubuntu and
+# may break environments that are not prepared for Puppet 4.
+(
+exec 1> >(logger -s -t user-data) 2>&1
+
+wget -O /tmp/puppetlabs-release.deb https://apt.puppetlabs.com/puppetlabs-release-pc1-`lsb_release -sc`.deb
+dpkg -i /tmp/puppetlabs-release.deb
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+apt-get -y upgrade
+
+apt-get install -y puppet-agent ruby ruby-dev zlib1g-dev libxml2-dev gcc make patch gnupg2
+
+update-alternatives --install /usr/bin/puppet puppet /opt/puppetlabs/bin/puppet 1
+update-alternatives --install /usr/bin/facter facter /opt/puppetlabs/bin/facter 1
+update-alternatives --install /usr/bin/hiera hiera /opt/puppetlabs/bin/hiera 1
+update-alternatives --install /usr/bin/mco mco /opt/puppetlabs/bin/mco 1
+
+gem install pupistry --no-ri --no-rdoc
+mkdir -p /etc/pupistry
+mkdir -p <%= puppetcode %>
+cat > /etc/pupistry/settings.yaml << "EOF"
+general:
+  app_cache: ~/.pupistry/cache
+  s3_bucket: <%= s3_bucket %>
+  s3_prefix: <%= s3_prefix %>
+  gpg_disable: <%= gpg_disable %>
+  gpg_signing_key: <%= gpg_signing_key %>
+agent:
+  puppetcode: <%= puppetcode %>
+  access_key_id: <%= access_key_id %>
+  secret_access_key: <%= secret_access_key %>
+  region: <%= region %>
+  proxy_uri: <%= proxy_uri %>
+  daemon_frequency: <%= daemon_frequency %>
+  daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
+EOF
+chmod 700 /etc/pupistry/settings.yaml
+chmod 700 <%= puppetcode %>
+pupistry apply --verbose
+
+)

data/resources/bootstrap/ubuntu-16.04.erb

@@ -0,0 +1,39 @@
+#!/bin/bash -x
+# Bootstrap for Ubuntu 16.04 LTS (Xenial)
+# It will *probably* work with other Ubuntu versions supported by Puppetlabs.
+# It *might* work with other Ubuntu or Debian derived systems.
+(
+exec 1> >(logger -s -t user-data) 2>&1
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+apt-get -y upgrade
+
+apt-get install -y puppet ruby ruby-dev zlib1g-dev libxml2-dev gcc make patch gnupg2
+
+gem install pupistry --no-ri --no-rdoc
+mkdir -p /etc/pupistry
+mkdir -p <%= puppetcode %>
+cat > /etc/pupistry/settings.yaml << "EOF"
+general:
+  app_cache: ~/.pupistry/cache
+  s3_bucket: <%= s3_bucket %>
+  s3_prefix: <%= s3_prefix %>
+  gpg_disable: <%= gpg_disable %>
+  gpg_signing_key: <%= gpg_signing_key %>
+agent:
+  puppetcode: <%= puppetcode %>
+  access_key_id: <%= access_key_id %>
+  secret_access_key: <%= secret_access_key %>
+  region: <%= region %>
+  proxy_uri: <%= proxy_uri %>
+  daemon_frequency: <%= daemon_frequency %>
+  daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
+EOF
+chmod 700 /etc/pupistry/settings.yaml
+chmod 700 <%= puppetcode %>
+pupistry apply --verbose
+
+)

data/resources/packer/PACKER_NOTES.md

@@ -8,7 +8,7 @@ is very useful when doing autoscaling and you need fast, consistent startup
 times.
 
 The packer templates provided will build an image which has Pupistry installed
-and will apply any manifests that match hostname of "packer". This should give
+and will apply any manifests that match hostname of `packer`. This should give
 you a good general purpose image, but if you want to autoscale a particular app
 you may wish to build packer images using specific hostnames to match your
 Puppet manifests
@@ -19,17 +19,17 @@ submit a pull request for review and if acceptable, will be merged.
 
 # Usage
 
-Refer to the main application README.md file for usage information.
+Refer to the main application `README.md` file for usage information.
 
 
 # Development Notes
 
 The filenames of the templates must be in the format of
-PLATFORM_OPERATINGSYSTEM.json.erb, this is intentional since OPERATINGSYSTEM
+`PLATFORM_OPERATINGSYSTEM.json.erb`, this is intentional since `OPERATINGSYSTEM`
 then matches one of the OSes in the bootstrap directory and we can
 automatically populate the inline shell commands.
 
-When debugging broken packer template runs, add -debug to the build command
+When debugging broken packer template runs, add `-debug` to the build command
 to have control over stepping through the build process. This will give you
 the ability to log into the instance before it gets terminated to do any
 debugging on the system if needed.
@@ -37,7 +37,7 @@ debugging on the system if needed.
 
 # Examples
 
-See the "aws_amazon-any.json.erb" template for an example on how the templates
+See the `aws_amazon-any.json.erb` template for an example on how the templates
 should be written for AWS.
 
 

data/settings.example.yaml

@@ -10,6 +10,11 @@ general:
   # the latest version of the artifacts.
   app_cache: ~/.pupistry/cache
 
+  # Some users like to use Pupistry with a non-AWS S3 endpoint such as Minio
+  # which requires setting an alternative endpoint below. DO NOT UNCOMMENT IF
+  # USING STANDARD AWS S3.
+  # s3_endpoint: s3.notaws.example.com
+  
   # The S3 bucket must be set in order to have a place to push and
   # pull artifact and manifests from. This bucket should be PRIVATE, we
   # only want your servers accessing the files!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jethro Carr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,7 +205,10 @@ files:
 - resources/bootstrap/debian-8.erb
 - resources/bootstrap/fedora-any.erb
 - resources/bootstrap/freebsd-10.erb
+- resources/bootstrap/openbsd-6.0.erb
 - resources/bootstrap/ubuntu-14.04.erb
+- resources/bootstrap/ubuntu-16.04-puppet4.erb
+- resources/bootstrap/ubuntu-16.04.erb
 - resources/packer/aws_amazon-any.json.erb
 - resources/packer/aws_freebsd-10.json.erb
 - resources/packer/aws_ubuntu-14.04.json.erb
@@ -232,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A workflow tool for Puppet Masterless Deployments