Configure Vagrant for dirsrv

2020-12-08 13:24:54 +01:00
1410 changed files with 44715 additions and 40193 deletions
--- a/.chef/config.rb
+++ b/.chef/config.rb
@@ -25,8 +25,6 @@ knife[:automatic_attribute_whitelist] = %w[
  cloud_v2
  chef_packages
 ]
-
-# Added to /etc/chef/client.rb on node bootstrap
-# https://docs.chef.io/attribute_persistence/
-knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
-knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
+knife[:default_attribute_whitelist] = []
+knife[:normal_attribute_whitelist] = ['knife_zero']
+knife[:override_attribute_whitelist] = []
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 /.chef/encrypted_data_bag_secret
-.chef/chef_guid
 /.bundle/
 /.vagrant/
-/.kitchen
 /nodes/vagrant-node.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
 [submodule "site-cookbooks/postgresql"]
 	path = site-cookbooks/postgresql
 	url = git@github.com:67P/postgresql.git
-[submodule "site-cookbooks/openresty"]
-	path = site-cookbooks/openresty
-	url = https://github.com/67P/chef-openresty.git
-[submodule "site-cookbooks/strfry"]
-	path = site-cookbooks/strfry
-	url = git@gitea.kosmos.org:kosmos/strfry-cookbook.git
-[submodule "site-cookbooks/deno"]
-	path = site-cookbooks/deno
-	url = git@gitea.kosmos.org:kosmos/deno-cookbook.git
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +0,0 @@
-chef-workstation
--- a/80
+++ b/80
@@ -2,43 +2,53 @@

 source 'https://supermarket.chef.io'

-cookbook 'elasticsearch', '~> 5.1.3'
-cookbook 'firewall',      '~> 6.2.16'
-cookbook 'redisio',       '~> 6.4.1'
-cookbook 'ruby_build',    '~> 2.5.0'
-
-cookbook 'ipfs',
-  git: 'https://gitea.kosmos.org/kosmos/ipfs-cookbook.git',
-  ref: 'v0.7.0'
 cookbook 'mediawiki',
  git: 'https://github.com/67P/mediawiki-cookbook.git',
  ref: 'nginx'
-
-cookbook 'apache2',                '= 3.3.0'
-cookbook 'apt',                    '~> 7.3.0'
-cookbook 'ark',                    '>= 5.0.0'
-cookbook 'composer',               '~> 2.7.0'
-cookbook 'fail2ban',               '~> 7.0.4'
-cookbook 'git',                    '~> 10.0.0'
-cookbook 'golang',                 '~> 5.3.1'
-cookbook 'hostname',               '= 0.4.2'
-cookbook 'hostsfile',              '~> 3.0.1'
-cookbook 'java',                   '~> 4.3.0'
-cookbook 'logrotate',              '= 2.2.0'
-cookbook 'mysql',                  '~> 8.7.3'
-cookbook 'nginx',                  '= 9.0.0'
-cookbook 'nodejs',                 '~> 7.3.1'
-cookbook 'ntp',                    '= 3.4.0'
-cookbook 'ohai',                   '~> 5.2.5'
-cookbook 'openssl',                '~> 8.5.5'
+cookbook 'redis',
+  git: 'https://github.com/phlipper/chef-redis.git',
+  ref: 'v0.5.6'
+cookbook 'postfix',                '= 5.0.2'
 cookbook 'php',                    '~> 8.0.0'
-cookbook 'postfix',                '~> 6.0.26'
-cookbook 'timezone_iii',           '= 1.0.4'
-cookbook 'ulimit',                 '~> 1.0.0'
+cookbook 'composer',               '~> 2.7.0'
+cookbook 'poise-ruby-build',       '~> 1.1.0'
+cookbook 'application',            '~> 5.2.0'
+cookbook 'application_javascript', '~> 1.0.0'
+cookbook 'application_git',        '= 1.1.0' # 1.2.0 doesn't work with knife-solo
+cookbook 'poise',                  '~> 2.8.2'
+cookbook 'poise-languages',        '~> 2.1.1'
+cookbook 'poise-javascript',       git: 'https://github.com/67p/poise-javascript.git',
+                                   ref: 'e5fff15'
+cookbook 'poise-archive',          '~> 1.5.0'
+cookbook 'poise-service',          '~> 1.5.2'
 cookbook 'users',                  '~> 5.3.1'
-cookbook 'zerotier',               '~> 1.0.7'
-cookbook 'unbound',                '~> 3.0.2'
-
-# openresty dependency
-cookbook 'jemalloc',               '~> 0.1.7'
-cookbook 'yum'
+cookbook 'hostname',               '= 0.4.2'
+cookbook 'firewall',               '~> 2.6.3'
+cookbook 'nginx',                  '= 9.0.0'
+# Remove when cookbooks stop depending on it, the build_essential resource is
+# part of Chef 14 (https://docs.chef.io/resource_build_essential.html)
+cookbook 'build-essential',        '~> 8.2.1'
+cookbook 'mysql',                  '~> 8.7.3'
+# cookbook 'postgresql',             '= 7.1.8'
+cookbook 'apt',                    '~> 7.3.0'
+cookbook 'git',                    '~> 10.0.0'
+cookbook 'hostsfile',              '= 2.4.5'
+cookbook 'ohai',                   '~> 5.2.5'
+cookbook 'nodejs',                 '~> 5.0.0'
+cookbook 'timezone_iii',           '= 1.0.4'
+cookbook 'ark',                    '>= 5.0.0'
+cookbook 'logrotate',              '= 2.2.0'
+cookbook 'openssl',                '~> 8.5.5'
+cookbook 'ntp',                    '= 3.4.0'
+cookbook 'apache2',                '= 3.3.0'
+cookbook 'chef-sugar',             '= 3.3.0'
+cookbook 'compat_resource',        '= 12.19.0'
+cookbook 'homebrew',               '= 3.0.0'
+cookbook 'mariadb',                '= 0.3.1'
+cookbook 'ipfs',
+  git: 'https://gitea.kosmos.org/kosmos/ipfs-cookbook.git',
+  ref: 'v0.7.0'
+cookbook 'elasticsearch',          '= 4.2.0'
+cookbook 'java',                   '~> 4.3.0'
+cookbook 'ulimit',                 '~> 1.0.0'
+cookbook 'golang',                 '~> 4.1.0'
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -1,109 +1,158 @@
 DEPENDENCIES
  apache2 (= 3.3.0)
+  application (~> 5.2.0)
+  application_git (= 1.1.0)
+  application_javascript (~> 1.0.0)
  apt (~> 7.3.0)
  ark (>= 5.0.0)
+  build-essential (~> 8.2.1)
+  chef-sugar (= 3.3.0)
+  compat_resource (= 12.19.0)
  composer (~> 2.7.0)
-  elasticsearch (~> 5.1.3)
-  fail2ban (~> 7.0.4)
-  firewall (~> 6.2.16)
+  elasticsearch (= 4.2.0)
+  firewall (~> 2.6.3)
  git (~> 10.0.0)
-  golang (~> 5.3.1)
+  golang (~> 4.1.0)
+  homebrew (= 3.0.0)
  hostname (= 0.4.2)
-  hostsfile (~> 3.0.1)
+  hostsfile (= 2.4.5)
  ipfs
    git: https://gitea.kosmos.org/kosmos/ipfs-cookbook.git
    revision: d7c25b6ce5fa490b6de3529fdc163fb64f1ece8a
    ref: v0.7.0
  java (~> 4.3.0)
-  jemalloc (~> 0.1.7)
  logrotate (= 2.2.0)
+  mariadb (= 0.3.1)
  mediawiki
    git: https://github.com/67P/mediawiki-cookbook.git
    revision: 78641e53635ba6cbd4a2a51fd597adb8fef1e8ad
    ref: nginx
  mysql (~> 8.7.3)
  nginx (= 9.0.0)
-  nodejs (~> 7.3.1)
+  nodejs (~> 5.0.0)
  ntp (= 3.4.0)
  ohai (~> 5.2.5)
  openssl (~> 8.5.5)
  php (~> 8.0.0)
-  postfix (~> 6.0.26)
-  redisio (~> 6.4.1)
-  ruby_build (~> 2.5.0)
+  poise (~> 2.8.2)
+  poise-archive (~> 1.5.0)
+  poise-javascript
+    git: https://github.com/67p/poise-javascript.git
+    revision: e5fff15098ac80c2a625b8d77d4eaf39d48f7ba7
+    ref: e5fff15
+  poise-languages (~> 2.1.1)
+  poise-ruby-build (~> 1.1.0)
+  poise-service (~> 1.5.2)
+  postfix (= 5.0.2)
+  redis
+    git: https://github.com/phlipper/chef-redis.git
+    revision: 7476279fc9c8727f082b8d77b5e1922dc2ef437b
+    ref: v0.5.6
  timezone_iii (= 1.0.4)
  ulimit (~> 1.0.0)
-  unbound (~> 3.0.2)
  users (~> 5.3.1)
-  yum
-  zerotier (~> 1.0.7)

 GRAPH
  apache2 (3.3.0)
+  application (5.2.0)
+    poise (~> 2.4)
+    poise-service (~> 1.0)
+  application_git (1.1.0)
+    application (~> 5.0)
+    git (>= 0.0.0)
+    poise (~> 2.0)
+  application_javascript (1.0.0)
+    application (~> 5.0)
+    poise (~> 2.0)
+    poise-javascript (~> 1.0)
+    poise-service (~> 1.0)
  apt (7.3.0)
-  ark (6.0.3)
-    seven_zip (>= 3.1)
+  ark (5.0.0)
+    seven_zip (>= 0.0.0)
  build-essential (8.2.1)
    mingw (>= 1.1)
    seven_zip (>= 0.0.0)
-  chocolatey (3.0.0)
+  chef-sugar (3.3.0)
+  compat_resource (12.19.0)
  composer (2.7.0)
    apt (>= 0.0.0)
    php (>= 0.0.0)
    windows (>= 0.0.0)
-  elasticsearch (5.1.3)
+  elasticsearch (4.2.0)
+    apt (>= 0.0.0)
    ark (>= 0.0.0)
-  fail2ban (7.0.4)
-    yum-epel (>= 0.0.0)
-  firewall (6.2.16)
+    chef-sugar (>= 0.0.0)
+    yum (>= 0.0.0)
+  firewall (2.6.5)
+    chef-sugar (>= 0.0.0)
  git (10.0.0)
-  golang (5.3.1)
-    ark (>= 6.0)
-  homebrew (5.4.1)
+  golang (4.1.0)
+    ark (~> 5.0)
+  homebrew (3.0.0)
  hostname (0.4.2)
    hostsfile (>= 0.0.0)
-  hostsfile (3.0.1)
+  hostsfile (2.4.5)
  ipfs (0.7.0)
    ark (>= 0.0.0)
  java (4.3.0)
    homebrew (>= 0.0.0)
    windows (>= 0.0.0)
-  jemalloc (0.1.7)
-    build-essential (>= 0.0.0)
  logrotate (2.2.0)
+  mariadb (0.3.1)
+    apt (>= 0.0.0)
+    yum (>= 0.0.0)
+    yum-epel (>= 0.0.0)
  mediawiki (0.5.0)
    apache2 (>= 0.0.0)
    nginx (>= 0.0.0)
    php (>= 0.0.0)
-  mingw (2.1.7)
+  mingw (2.1.0)
    seven_zip (>= 0.0.0)
-  mysql (8.7.4)
+  mysql (8.7.3)
  nginx (9.0.0)
    build-essential (>= 5.0)
    ohai (>= 4.1.0)
    yum-epel (>= 0.0.0)
-  nodejs (7.3.3)
+  nodejs (5.0.0)
    ark (>= 2.0.2)
-    chocolatey (>= 3.0)
+    build-essential (>= 0.0.0)
  ntp (3.4.0)
  ohai (5.2.5)
  openssl (8.5.5)
-  php (8.0.1)
+  php (8.0.0)
    yum-epel (>= 0.0.0)
-  postfix (6.0.26)
-  redisio (6.4.1)
-    selinux (>= 0.0.0)
-  ruby_build (2.5.0)
-    homebrew (>= 0.0.0)
-    yum-epel (>= 0.0.0)
-  selinux (6.1.12)
-  seven_zip (4.2.2)
+  poise (2.8.2)
+  poise-archive (1.5.0)
+    poise (~> 2.6)
+  poise-build-essential (1.0.0)
+    poise (~> 2.6)
+  poise-git (1.0.0)
+    poise (~> 2.6)
+    poise-languages (~> 2.1)
+  poise-javascript (1.2.1)
+    poise (~> 2.0)
+    poise-languages (~> 2.0)
+  poise-languages (2.1.2)
+    poise (~> 2.5)
+    poise-archive (~> 1.0)
+  poise-ruby (2.4.0)
+    poise (~> 2.0)
+    poise-languages (~> 2.0)
+  poise-ruby-build (1.1.0)
+    poise (~> 2.0)
+    poise-build-essential (~> 1.0)
+    poise-git (~> 1.0)
+    poise-ruby (~> 2.1)
+  poise-service (1.5.2)
+    poise (~> 2.0)
+  postfix (5.0.2)
+  redis (0.5.6)
+    apt (>= 0.0.0)
+  seven_zip (3.1.1)
+    windows (>= 0.0.0)
  timezone_iii (1.0.4)
  ulimit (1.0.0)
-  unbound (3.0.2)
  users (5.3.1)
-  windows (7.0.2)
-  yum (7.4.13)
-  yum-epel (4.2.3)
-  zerotier (1.0.7)
-    ohai (>= 0.0.0)
+  windows (6.0.0)
+  yum (5.1.0)
+  yum-epel (3.3.0)
--- a/6
+++ b/6
@@ -1,3 +1,7 @@
 source 'https://rubygems.org'

-gem 'knife-zero', '>= 2.4.2'
+gem 'chef', '~> 15.3.14'
+gem 'berkshelf', '~> 7.0'
+gem 'knife-zero'
+gem 'cookstyle'
+gem 'test-kitchen'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,316 +1,255 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    addressable (2.8.0)
+    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.6)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.56.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt_pbkdf (1.1.0)
-    builder (3.2.4)
-    chef (17.9.42)
-      addressable
-      aws-sdk-s3 (~> 1.91)
-      aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.9.42)
-      chef-utils (= 17.9.42)
-      chef-vault
-      chef-zero (>= 14.0.11)
-      corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.4.0)
-      erubis (~> 2.7)
-      ffi (>= 1.5.0)
-      ffi-libarchive (~> 1.0, >= 1.0.3)
-      ffi-yajl (~> 2.2)
-      iniparse (~> 1.4)
-      inspec-core (~> 4.23)
-      license-acceptance (>= 1.0.5, < 3)
+    ast (2.4.0)
+    bcrypt_pbkdf (1.0.1)
+    berkshelf (7.0.8)
+      chef (>= 13.6.52)
+      chef-config
+      cleanroom (~> 1.0)
+      concurrent-ruby (~> 1.0)
+      minitar (>= 0.6)
      mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
+      mixlib-config (>= 2.2.5)
+      mixlib-shellout (>= 2.0, < 4.0)
+      octokit (~> 4.0)
+      retryable (>= 2.0, < 4.0)
+      solve (~> 4.0)
+      thor (>= 0.20)
+    builder (3.2.3)
+    chef (15.3.14)
+      addressable
+      bcrypt_pbkdf (~> 1.0)
+      bundler (>= 1.10)
+      chef-config (= 15.3.14)
+      chef-zero (>= 14.0.11)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      ed25519 (~> 1.2)
+      erubis (~> 2.7)
+      ffi (~> 1.9, >= 1.9.25)
+      ffi-libarchive
+      ffi-yajl (~> 2.2)
+      highline (>= 1.6.9, < 2)
+      iniparse (~> 1.4)
+      license-acceptance (~> 1.0, >= 1.0.5)
+      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-authentication (~> 2.1)
      mixlib-cli (>= 2.1.1, < 3.0)
      mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
-      net-sftp (>= 2.1.2, < 4.0)
-      ohai (~> 17.0)
+      mixlib-shellout (>= 3.0.3, < 4.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 4.2, < 6)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 15.0)
      plist (~> 3.2)
      proxifier (~> 1.0)
      syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
-      uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.16)
-    chef-config (17.9.42)
+      train-core (~> 3.0)
+      train-winrm
+      tty-screen (~> 0.6)
+      uuidtools (~> 2.1.5)
+    chef-config (15.3.14)
      addressable
-      chef-utils (= 17.9.42)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
      tomlrb (~> 1.2)
-    chef-telemetry (1.1.1)
-      chef-config
-      concurrent-ruby (~> 1.0)
-    chef-utils (17.9.42)
-      concurrent-ruby
-    chef-vault (4.1.5)
-    chef-zero (15.0.11)
+    chef-zero (14.0.13)
      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 5.0)
+      hashie (>= 2.0, < 4.0)
      mixlib-log (>= 2.0, < 4.0)
      rack (~> 2.0, >= 2.0.6)
      uuidtools (~> 2.1)
-      webrick
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    corefoundation (0.3.10)
-      ffi (>= 1.15.0)
+    cleanroom (1.0.0)
+    concurrent-ruby (1.1.5)
+    cookstyle (5.7.0)
+      rubocop (= 0.72.0)
    diff-lcs (1.3)
-    erubi (1.10.0)
+    ed25519 (1.2.4)
+    equatable (0.6.1)
    erubis (2.7.0)
-    faraday (1.4.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+    faraday (0.17.0)
      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    ffi (1.15.5)
-    ffi-libarchive (1.1.3)
+    ffi (1.11.1)
+    ffi-libarchive (0.4.10)
      ffi (~> 1.0)
-    ffi-yajl (2.4.0)
-      libyajl2 (>= 1.2)
+    ffi-yajl (2.3.1)
+      libyajl2 (~> 1.2)
    fuzzyurl (0.9.0)
-    gssapi (1.3.1)
+    gssapi (1.3.0)
      ffi (>= 1.0.1)
    gyoku (1.3.1)
      builder (>= 2.1.2)
-    hashie (4.1.0)
-    highline (2.0.3)
+    hashie (3.6.0)
+    highline (1.7.10)
    httpclient (2.8.3)
-    iniparse (1.5.0)
-    inspec-core (4.52.9)
-      addressable (~> 2.4)
-      chef-telemetry (~> 1.0, >= 1.0.8)
-      faraday (>= 0.9.0, < 1.5)
-      faraday_middleware (~> 1.0)
-      hashie (>= 3.4, < 5.0)
-      license-acceptance (>= 0.2.13, < 3.0)
-      method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0)
-      multipart-post (~> 2.0)
-      parallel (~> 1.9)
-      parslet (>= 1.5, < 2.0)
-      pry (~> 0.13)
-      rspec (>= 3.9, < 3.11)
-      rspec-its (~> 1.2)
-      rubyzip (>= 1.2.2, < 3.0)
-      semverse (~> 3.0)
-      sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
+    iniparse (1.4.4)
    ipaddress (0.8.3)
-    jmespath (1.5.0)
-    json (2.6.1)
-    knife (17.9.26)
-      bcrypt_pbkdf (~> 1.1)
-      chef (>= 17)
-      chef-config (>= 17)
-      chef-utils (>= 17)
-      chef-vault
-      erubis (~> 2.7)
-      ffi (>= 1.15)
-      ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 3)
-      license-acceptance (>= 1.0.5, < 3)
-      mixlib-archive (>= 0.4, < 2.0)
-      mixlib-cli (>= 2.1.1, < 3.0)
-      net-ssh (>= 5.1, < 7)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 17.0)
-      pastel
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
-      tty-prompt (~> 0.21)
-      tty-screen (~> 0.6)
-      tty-table (~> 0.11)
-    knife-zero (2.4.2)
+    jaro_winkler (1.5.3)
+    json (2.2.0)
+    knife-zero (2.1.0)
      chef (>= 15.0)
-      knife (>= 17.0)
-    libyajl2 (2.1.0)
-    license-acceptance (2.1.13)
+    libyajl2 (1.2.0)
+    license-acceptance (1.0.13)
      pastel (~> 0.7)
-      tomlrb (>= 1.2, < 3.0)
-      tty-box (~> 0.6)
-      tty-prompt (~> 0.20)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
    little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.2.2)
      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    method_source (1.0.0)
-    mixlib-archive (1.1.7)
+      multi_json (~> 1.10)
+    minitar (0.9)
+    mixlib-archive (1.0.1)
      mixlib-log
-    mixlib-authentication (3.0.10)
-    mixlib-cli (2.1.8)
-    mixlib-config (3.0.9)
+    mixlib-authentication (2.1.1)
+    mixlib-cli (2.1.1)
+    mixlib-config (3.0.1)
      tomlrb
-    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.5)
-      chef-utils
-    multi_json (1.15.0)
+    mixlib-install (3.11.21)
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-log (3.0.1)
+    mixlib-shellout (3.0.7)
+    mixlib-versioning (1.2.7)
+    molinillo (0.6.6)
+    multi_json (1.13.1)
    multipart-post (2.1.1)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
+    necromancer (0.5.0)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (5.2.0)
    net-ssh-gateway (2.0.0)
      net-ssh (>= 4.0.0)
    net-ssh-multi (1.2.1)
      net-ssh (>= 2.6.5)
      net-ssh-gateway (>= 1.2.0)
    nori (2.6.0)
-    ohai (17.9.0)
-      chef-config (>= 14.12, < 18)
-      chef-utils (>= 16.0, < 18)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ohai (15.3.1)
+      chef-config (>= 12.8, < 16)
      ffi (~> 1.9)
      ffi-yajl (~> 2.2)
      ipaddress
      mixlib-cli (>= 1.7.0)
      mixlib-config (>= 2.0, < 4.0)
      mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (~> 3.2, >= 3.2.5)
+      mixlib-shellout (>= 2.0, < 4.0)
      plist (~> 3.1)
-      train-core
+      systemu (~> 2.6.4)
      wmi-lite (~> 1.0)
-    parallel (1.21.0)
-    parslet (1.8.2)
-    pastel (0.8.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)
+      ast (~> 2.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
      tty-color (~> 0.5)
-    plist (3.6.0)
+    plist (3.5.0)
    proxifier (1.0.3)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    ruby2_keywords (0.0.5)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.2)
+    public_suffix (4.0.1)
+    rack (2.0.7)
+    rainbow (3.0.0)
+    retryable (3.0.4)
+    rubocop (0.72.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    rubyntlm (0.6.2)
+    rubyzip (1.3.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
    semverse (3.0.0)
-    sslshake (1.3.1)
-    strings (0.2.1)
-      strings-ansi (~> 0.2)
-      unicode-display_width (>= 1.5, < 3.0)
+    solve (4.0.2)
+      molinillo (~> 0.6)
+      semverse (>= 1.1, < 4.0)
+    strings (0.1.6)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
+    strings-ansi (0.1.0)
    syslog-logger (1.6.8)
-    thor (1.2.1)
-    tomlrb (1.3.0)
-    train-core (3.8.7)
-      addressable (~> 2.5)
-      ffi (!= 1.13.0)
+    systemu (2.6.5)
+    test-kitchen (2.3.3)
+      bcrypt_pbkdf (~> 1.0)
+      ed25519 (~> 1.2)
+      license-acceptance (~> 1.0, >= 1.0.11)
+      mixlib-install (~> 3.6)
+      mixlib-shellout (>= 1.2, < 4.0)
+      net-scp (>= 1.1, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+      net-ssh-gateway (>= 1.2, < 3.0)
+      thor (~> 0.19)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1)
+    thor (0.20.3)
+    tomlrb (1.2.8)
+    train-core (3.1.3)
      json (>= 1.8, < 3.0)
      mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.12)
-      winrm (>= 2.3.6, < 3.0)
-      winrm-elevated (~> 1.2.2)
+      net-scp (>= 1.2, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+    train-winrm (0.2.5)
+      winrm (~> 2.0)
      winrm-fs (~> 1.0)
-    tty-box (0.7.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
+    tty-box (0.4.1)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.6)
      tty-cursor (~> 0.7)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
+    tty-color (0.5.0)
+    tty-cursor (0.7.0)
+    tty-prompt (0.19.0)
+      necromancer (~> 0.5.0)
+      pastel (~> 0.7.0)
+      tty-reader (~> 0.6.0)
+    tty-reader (0.6.0)
      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    tty-table (0.12.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-screen (~> 0.8)
-    unicode-display_width (2.1.0)
+      tty-screen (~> 0.7)
+      wisper (~> 2.0.0)
+    tty-screen (0.7.0)
+    unicode-display_width (1.6.0)
    unicode_utils (1.4.0)
-    uuidtools (2.2.0)
-    vault (0.16.0)
-      aws-sigv4
-    webrick (1.7.0)
-    winrm (2.3.6)
+    uuidtools (2.1.5)
+    winrm (2.3.2)
      builder (>= 2.1.2)
-      erubi (~> 1.8)
+      erubis (~> 2.7)
      gssapi (~> 1.2)
      gyoku (~> 1.0)
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
-      erubi (~> 1.8)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.1)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
-      erubi (~> 1.8)
+    winrm-fs (1.3.2)
+      erubis (~> 2.7)
      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
+      rubyzip (~> 1.1)
      winrm (~> 2.0)
-    wisper (2.0.1)
-    wmi-lite (1.0.5)
+    wisper (2.0.0)
+    wmi-lite (1.0.2)

 PLATFORMS
-  x86_64-darwin-18
-  x86_64-darwin-19
-  x86_64-linux
+  ruby

 DEPENDENCIES
-  knife-zero (>= 2.4.2)
+  berkshelf (~> 7.0)
+  chef (~> 15.3.14)
+  cookstyle
+  knife-zero
+  test-kitchen

 BUNDLED WITH
-   2.2.15
+   1.17.3
--- a/README.md
+++ b/README.md
@@ -1,60 +1,20 @@
-This repository contains all infrastructure automation code that we use to set
-up and configure servers, virtual machines, and applications for Kosmos hosted
-services.
-
-Chef cookbooks are written in Ruby, and based on [Chef Infra
-resources](https://docs.chef.io/resources/). Some cookbooks contain integration
-test suites based on [Test Kitchen](https://docs.chef.io/workstation/kitchen/).
-
-Note: Manual configuration of servers and applications is highly discouraged,
-and can be overwritten or lost without notice!
-
-## Setup
-
-### Install Chef Workstation
-
-* macOS, Windows, RHEL, Ubuntu: https://docs.chef.io/workstation/install_workstation/
-* Arch Linux: https://aur.archlinux.org/packages/chef-workstation
-
-#### rbenv
-
-If you use rbenv to manage Ruby versions on your system, install the
-[rbenv-chef-workstation](https://github.com/docwhat/rbenv-chef-workstation)
-plugin.
-
-### Install gem dependencies
-
-Clone this repository, `cd` into it, and run:
+### Install dependencies

    bundle install

-## Common tasks
+### Run Chef Solo

-### Bootstrap a new host server
-
-    knife zero bootstrap root@server-name.kosmos.org --run-list "role[base],role[kvm_host]" --secret-file .chef/encrypted_data_bag_secret
-
-### Bootstrap a new VM
-
-    knife zero bootstrap ubuntu@zerotier-ip-address -x ubuntu --sudo --run-list "role[base],role[kvm_guest]" --secret-file .chef/encrypted_data_bag_secret
-
-### Bootstrap a new VM with environment and role/app (postgres replica as example)
-
-    knife zero bootstrap ubuntu@10.1.1.134 -x ubuntu --sudo --environment production --run-list "role[base],role[kvm_guest],role[postgresql_replica]" --secret-file .chef/encrypted_data_bag_secret
-
-### Run Chef Zero on a host server
-
-    knife zero converge -p2222 name:server-name.kosmos.org
-
-### Run Chef Zero on a VM
-
-    knife zero converge -a knife_zero.host name:vm-name-23
+    knife zero converge name:dev.kosmos.org

 ### Update Chef Client on a server:

    knife zero converge name:dev.kosmos.org --client-version 15.3.14

-## Managing cookbooks
+### Bootstrap a new server
+
+    knife zero bootstrap root@dev.kosmos.org --run-list "recipe[kosmos-base],..." -j '{"example_cookbook":{"memory_max":"256M"}}' --secret-file .chef/encrypted_data_bag_secret
+
+### Managing cookbooks

 Cookbooks are managed via Berkshelf. Run `berks --help` for command help.

@@ -65,14 +25,3 @@ Install cookbooks listed in Berksfile:
 Vendor installed cookbooks to the `cookbooks/` dir:

    berks vendor cookbooks/ --delete
-
-## "Expired" TLS certificates
-
-If you encounter expired TLS certificates during a Chef run (e.g. for remote
-files), the issue is likely that the certificate has been issued by Let's
-Encrypt and Chef is still using its own, outdated CA cert store (see
-[here](https://github.com/chef/chef/issues/12126#issuecomment-932067530) for
-example).
-
-As a hotfix, you can manually remove the "DST Root CA X3" cert from
-`/opt/chef/embedded/ssl/cert.pem` on the machine you're trying to converge.
--- a/171
+++ b/171
@@ -2,91 +2,110 @@
 # vi: set ft=ruby :

 # All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version.
-#
-# Documentation for all configuration options can be found here:
-# https://www.vagrantup.com/docs/vagrantfile
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
 Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "bento/ubuntu-18.04"

  config.vm.provider :virtualbox do |vb|
+    # Customize the amount of memory on the VM:
    vb.memory = "1024"
    vb.cpus = 2
  end

-  # config.vm.provider :docker do |d, override|
-  #   d.image = "nishidayuya/docker-vagrant-ubuntu:xenial"
-  #   d.has_ssh = true
-  #   override.vm.box = nil
-  #   override.ssh.port = 22
+  config.vm.provider :docker do |d, override|
+    d.image = "nishidayuya/docker-vagrant-ubuntu:xenial"
+    d.has_ssh = true
+    override.vm.box = nil
+    override.ssh.port = 22
+  end
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 389, host: 389
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
  # end

-  config.vm.define "ldap" do |ldap|
-    ldap.vm.box = "bento/ubuntu-18.04"
-    ldap.vm.network "forwarded_port", guest: 389, host: 389
-    ldap.vm.network "private_network", ip: "192.168.56.5"
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   sudo apt-get update
+  #   sudo apt-get install -y apache2
+  # SHELL

-    ldap.vm.provision :chef_zero do |chef|
-      chef.version                            = "18.2.7"
-      chef.node_name                          = "vagrant-node-ldap"
-      chef.arguments                          = "--chef-license accept"
-      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
-      chef.data_bags_path                     = "data_bags"
-      chef.roles_path                         = "roles"
-      chef.nodes_path                         = "nodes"
-      chef.environments_path                  = "environments"
-      chef.encrypted_data_bag_secret_key_path = ".chef/encrypted_data_bag_secret"
-      chef.environment                        = "development"
-
-      chef.add_recipe "kosmos-base"
-      chef.add_recipe "kosmos-dirsrv"
-    end
+  config.vm.provision :chef_zero do |chef|
+    chef.version                            = '15.3.14'
+    chef.arguments                          = "--chef-license accept"
+    chef.cookbooks_path                     = ['cookbooks', 'site-cookbooks']
+    chef.data_bags_path                     = 'data_bags'
+    chef.roles_path                         = 'roles'
+    chef.node_name                          = "vagrant-node"
+    chef.nodes_path                         = 'nodes'
+    chef.environments_path                  = 'environments'
+    chef.encrypted_data_bag_secret_key_path = '.chef/encrypted_data_bag_secret'
+    chef.environment                        = 'development'
+    chef.add_recipe 'kosmos-base'
+    chef.add_recipe 'kosmos-dirsrv'
+    # chef.add_recipe 'kosmos-bitcoin::source'
+    # chef.add_recipe 'kosmos-mediawiki'
+    # chef.add_recipe 'kosmos-wordpress'
+    # chef.add_recipe 'kosmos-ejabberd'
+    # chef.add_recipe 'kosmos-hubot::botka_freenode'
+    # chef.add_recipe 'ipfs'
+    # chef.add_recipe 'kredits-github'
+    # chef.add_recipe 'sockethub'
+    # chef.add_recipe 'kosmos-mastodon'
+    # chef.add_recipe 'kosmos-mastodon::nginx'
+    # chef.add_recipe '5apps-hubot::xmpp_botka'
+    # chef.add_recipe 'kosmos-hubot'
  end
-
-  config.vm.define "bitcoin" do |bitcoin|
-    bitcoin.vm.box = "generic/ubuntu2004"
-    bitcoin.vm.network "forwarded_port", guest: 4201, host: 4201
-    bitcoin.vm.network "private_network", ip: "192.168.56.6"
-    # bitcoin.vm.synced_folder "../kredits/yap/", "/opt/yap"
-
-    bitcoin.vm.provision :chef_zero do |chef|
-      chef.version                            = "18.2.7"
-      chef.node_name                          = "vagrant-node-bitcoin"
-      chef.arguments                          = "--chef-license accept"
-      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
-      chef.data_bags_path                     = "data_bags"
-      chef.roles_path                         = "roles"
-      chef.nodes_path                         = "nodes"
-      chef.environments_path                  = "environments"
-      chef.encrypted_data_bag_secret_key_path = ".chef/encrypted_data_bag_secret"
-      chef.environment                        = "development"
-
-      chef.add_recipe "kosmos-base"
-      chef.add_recipe "kosmos-bitcoin::source"
-      # chef.add_recipe "kosmos-bitcoin::foo"
-    end
-  end
-
-  config.vm.define "openresty" do |openresty|
-    openresty.vm.box = "bento/ubuntu-20.04"
-    openresty.vm.network "forwarded_port", guest: 6379, host: 6379
-    openresty.vm.network "private_network", ip: "192.168.56.7"
-
-    openresty.vm.provision :chef_zero do |chef|
-      chef.version                            = "18.2.7"
-      chef.node_name                          = "vagrant-openresty"
-      chef.arguments                          = "--chef-license accept"
-      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
-      chef.data_bags_path                     = "data_bags"
-      chef.roles_path                         = "roles"
-      chef.nodes_path                         = "nodes"
-      chef.environments_path                  = "environments"
-      chef.encrypted_data_bag_secret_key_path = ".chef/encrypted_data_bag_secret"
-      chef.environment                        = "development"
-
-      chef.add_recipe "kosmos-base"
-      chef.add_role "openresty"
-      chef.add_role "openresty_proxy"
-    end
-  end
-
 end
--- a/clients/andromeda.kosmos.org.json
+++ b/clients/andromeda.kosmos.org.json
@@ -0,0 +1,4 @@
+{
+  "name": "andromeda.kosmos.org",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAI/4XcdJQ4rL3JtQ86Q\nUtdFSBdMnSPxUoHbhXXTaFEB2D0hqyCjfGmt8JqoBaRmj0zNHQvOMixe+SeyfyDs\nDPHQZ5E45f0eBYPchvOjNOZTP6RYhfa1pBRW6D6JJ+2bYW1jfnTur1Tkeg0ZL6zg\nybmcsYeDYeNXEsAGQIz+zqgNHPsTLL7U+eY9u3AYhOPaBXSnaqxPxvYx9fBRWbrx\ntFz/oXjurvLS5rMhts0s6AyMKEs+5bLhSreqGsh+1CfAt2qGNPPY7J5VL1B+cAfk\nFWYD5uWo2NvYKm94UpKsmZgFKFQBglFYpMidYdbl/NNJFq3EJDRyRlzDB8VliOuG\nnwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/barnard.kosmos.org.json
+++ b/clients/barnard.kosmos.org.json
@@ -0,0 +1,4 @@
+{
+  "name": "barnard.kosmos.org",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Rr+3giLkr0xqZPRPn9Z\ngxvmAaUo6VSs1qnMfznNNN/CGCYett0ndEJp4wI8xp2fq75b2TSm4jqhqjtgYVVD\nEeSOKTZEnoE7YSssodGTAK5YnrVIPNyWd61Ih/NkHzCjlcuVX6sJD7z/pgK+WMao\nAAxzMrefvHALFBmJIxbugakru/nvDcQeV8DOF+UjzsO5CTC0BUzCFeXBG7HD3W+6\nP2wQlMKteM9uQU6Agx7XegeWS2Lfnxg1em5TNbw1PbLofROwr1pCUPfVzQ0CAVxm\nXLzmA2xtMqCT2j83DU9WleZPYiS0rg+r9T1jsDX0TyH4NTV8gO2SJ9BMUNcX+3Ox\nmQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/centaurus.kosmos.org.json
+++ b/clients/centaurus.kosmos.org.json
@@ -0,0 +1,4 @@
+{
+  "name": "centaurus.kosmos.org",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsVV0j8DQSlefAAAmafjx\nyT1j1idLQF0oltTp2p4jFEsnEdFeP4Plpluy+detra1gM9sBBBuvRKGt8NP+Yoc7\nbnn7qU13E/nWUQh9n15+jjgUirXg7CxluKfj2VvsdchJRIvzDwwZz5sqITiGG7/S\n2r2KBBBnuGlGShQJZhhcLW4P+3YgxW8DUgUsRdvreVuvF1hcnaSymldfos1CqYL8\nawtsZ2rtdZHmZxfguXl91WBCu2OxsT13i3kInnDQsFB0tYKq+TFSLAHxneKTYPRW\ngYgP9RSBZ51iQ+6R1CenYsr4SePVCmwaZGb8bmd0QLvGKlBhjX29a5bE5tjzeoBD\nuwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/discourse-2.json
+++ b/clients/discourse-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "discourse-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwinJNGMUzUdrZwx/ZCkU\nxZRnuWqZHXHdZtkEG6beMY1sB/PpGknLgcfTjhh4FR/5hIXqBcVdUj3DZiTmhd8o\n0QpEkJPNKd08PN12CyShPwCcIA1KTqsCsNys+bp6Wff84JClAe/Oza6DonoRmhqO\ncFxSQcscuv8a6Gc/1X/aySmS01hwL+r9p0VZBEPNKEObgJXHsGIIbajlxgq037X/\n2/IsIk2etXTUSWPJLxNKSXzxC3l4Izw4NfvUgipByPTeJQ2YAVxbvrDEqquBGk5S\nll/mlF+fKX0QvUhm7sdLiSy++rHc8R1ny+4LnR1gAOscYMuLbDbpJnW0Rc0GEJOL\nVwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/drone-1.json
+++ b/clients/drone-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "drone-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0DLEt7jfKPH7X7pBknG3\nWoB6Q6Vffl6Q0GRxQiMJ1uRC79dulKH097CYfLzIXFZD9gRRP4K78vW5BA2spXVV\nn3qrak9JT6BGgdFrkBEdMNGZyz814aMiyhPZrQUrmIzyH8R04xZgv7UH86qdNQ5p\nPeIXS7gU7/0PmwRgEBiM1KLq+Kba6pYdGefKqxx5D59xweH+yE+rbd5ac9xn2GP7\nyOiZoG2sMuksq7d3O4SeTS2lBAmG5IeiP2iWvHWpZD48PTr78ItkTgIbaqZU2PXV\ng+2OcJPTel5xISooe5FvW8gdpC9SYoBPvgJuJ6czc1+LdUSK7pE7577eAJNDlh+H\nRwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ejabberd-1.json
+++ b/clients/ejabberd-1.json
@@ -0,0 +1,4 @@
+{
+  "name": "ejabberd-1",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtoVmQAEmmAWjjzi5X8Ia\n9sl2aH8Lh0AsckM0aE3hvw9lGfbNCPpYWrr0uh7R6/+13Z0OghrT3yDAZ+XfH39Y\nuGomazTzSMMOEofjepo+nXSgq4meFfX5vobYG7rpBdz1EsIT1bElHduItA2zsw9J\nFpXtGd4BjumMq1VykSTA+QaEE8byes/+groQTtXPqXf5gJMxyGlh4SU0MzmkGHaW\n8c9BPCQrV0CMiuGOGJ5mZ28HajbvSg3+bpgwThh3M5uQaQ6on1N2pvJuBypUySS6\nyc4TauocUcUsULYXq9wM8/rqDYsUah0PR0WSiOi90m5thGeBchFAmhdCvrS34FlR\nVQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/ejabberd-2.json
+++ b/clients/ejabberd-2.json
@@ -0,0 +1,4 @@
+{
+  "name": "ejabberd-2",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAudueTsPYnRXRu/rmMGZe\nI7LdyrWKdY9FJaRhkXR5J9Yb8QnIcDS7ZXDJsVhyQW8pZ2DuaIs5dmGYvRtmx0ol\nqHTEel01Q3/xI1blJoq4uRm639PB5M9dSJ0w+s6P5zj7rbFKpvMBYxBSK6z+gXIc\n/L1ayJ6JOssX5/tEvcvx/d4GIxof/Q+puACAXawx7W88Wl7yYWdBQ78uTPHzuMyB\n8BRYz24tki/O1fa9JijW32d3EELD0EccI3iJ+/CR4BFEEM2QdDczY/Q6Ny7h7inH\n/TdU246nvtJIx7bAZHmDIDva8YPtL27RIOQ3JqBBe7prQP5Q9MBGPyCXWAglj99a\n6QIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/ejabberd-4.json
+++ b/clients/ejabberd-4.json
@@ -1,4 +0,0 @@
-{
-  "name": "ejabberd-4",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6FuI13W2sft83OIWe59/\nYTfpTfKcYTCq5zAQEu87OYHHQeBAYo0W/g/qICh3qw0ie2QMPyggAezoeR5VQdLt\nkJq1X9AHqyX59YThzj7dLCCEKq+mAdriuKzNGu8eml4DRM3m+xw7jFzcwwrD8ECZ\nY+Kn7bcOtozx0mXpEm+cO2cOKmRQn0VJwAQSe6eW301iGmpR9et4hDqMjhiUiwaU\nWAqpsmP/JQMLAX2gLzwilD63VCQlcQCDq/D1m/N6bWb1L47zNAzwOCSYV92bGNDe\nRe+4gCVVLpfGWKbkjQFDraCmME7+O50WpbfowylF8gOzgl3AvnpC/LOSzT8VtMPr\nZQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ejabberd-8.json
+++ b/clients/ejabberd-8.json
@@ -1,4 +0,0 @@
-{
-  "name": "ejabberd-8",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2r+emfhx7bl7MxEeIDGY\nKnj3xEyFvVgXL7GwOsbKszFVgZ17yuPwa6vuiJsZsbcFC/nXgGNH2WF5FEv7XhOi\nwE8KMeNrR4xQ9BEANRlRgUTfrkhZG1NCy7PpVBb7L2r36STBuFSdQJmruJAfvTHm\na4hhmfaSIJ0Wa+Q24gL1GNwkSRdOhXRYxB4OvNIJzzuC3XqgugQVG5xzZh0kULQs\nkZVvkL5dM0FEZzBn8aK2sohTFDivvYJy7PAogC9Z5M1nPatZBowruUZvCym3Wh1J\nRtBwsS9SsTcsUqaT9FpEa7vYUney1/R8G2FAFufTyztjgBQzh78GhU+dek+ycIf1\nVQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/email-1.json
+++ b/clients/email-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "email-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxDRdvMYKRjejoFsOxS6s\n4gj0Gsaxk/j25A5VPHBcEhr+NOh8W/6NnTTHuFMaorEIl/2kscgrcwriDN7xIFmO\nz/C1+spDLPMGSWd+422KSS3fjVfByLlMwxh171RDZBlZVze7H7CIV/rxCG7Ri85y\nPvyp2rT4ioyVGyYK3e8CiXwQckpFC1ex9VRk/GR8zbCYUIw+qbTFRcl/mQuxKqWK\n22vrgAR+6OL8lcyhssmKiQ1r3GtxwJusgffw4/5S8sRR1z8OB4wiwgOWR1E36EbF\nhTBjFzPiKVjVjP/TQpUoYdnBhuD223M8nPWJl1HMVQPMjL6R2BBOF+iK0Wx9SiFD\nJwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-10.json
+++ b/clients/garage-10.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-10",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2+3Wo+KkXVJCOX1SxT9\nSdwKXgPbCDM3EI9uwoxhMxQfRyN53dxIsBDsQUVOIe1Z8yqm4FenMQlNmeDR+QLE\nvNFf1fisinW+D9VVRm+CjcJy96i/Dyt786Z6YRrDlB860HxCbfTL2Zv5BRtbyIKg\nhz5gO+9PMEpPVR2ij9iue4K6jbM1AAL2ia/P6zDWLJqeIzUocCeHV5N0Z3jXH6qr\nf444v78x35MMJ+3tg5h95SU1/PDCpdSTct4uHEuKIosiN7p4DlYMoM5iSyvVoujr\nflRQPEpGzS9qEt3rDo/F4ltzYMx6bf1tB/0QaBKD+zwPZWTTwf61tSBo5/NkGvJc\nFQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-11.json
+++ b/clients/garage-11.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-11",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzfZcNEQojtmaogd9vGP/\nMsVPhAOlQ4kxKgrUas+p+XT7lXRan6b3M8UZEleIaL1HWsjSVwtFWRnNl8kg8rF8\nNEkLeOX8kHf7IoXDFOQa2TXanY8tSqrfh9/heFunt4Q3DluVt7S3bBdwukbDXm/n\nXJS2EQP33eJT4reL6FpVR0oVlFCzI3Vmf7ieSHIBXrbXy7AIvGC2+NVXvQle6pqp\nx0rqU6Wc6ef/VtIv+vK3YFnt9ue3tC63mexyeNKgRYf1YjDx61wo2bOY2t8rqN8y\nHeZ3dmAN8/Vwjk5VGnZqK7kRQ92G4IcE+mEp7MuwXcLqQ9WB960o+evay+o1R5JS\nhwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-2.json
+++ b/clients/garage-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuZbclnx/1Oas1+q5vUz\nsvCpTwKBrb3dah2YoZfZg0K15+MZshSyCZxo5T+SGp2OwhV65UptMJZbeyhVtzEp\ncN62G7exf65rNesXOL82PNQC6iInxNvyOgzdTOo7tdQ2ln/3QRpZOtUOB9PEkK17\nNmHfVIWKEc9YajRff5zE1LzSWulTNJ3D4GAIhsli//Rv45MhjyYoQKf1AXtqI72A\n2FE2YWXOjjSHJIPRfcUrmBOmEt/gkWySxGAs8Dg112vOC1ftk0KiQFWKVydMicIj\nyySQH1/neQFSq2HLNajDc9S2l7cjhPEjov7taS9LkXfPtnfN8ajEEP0S2MgZnf4N\ngwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-7.json
+++ b/clients/garage-7.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-7",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoAigZUSwsfbBHx2PQ6W\n38Ght6eCvbpW1lsS58hTieRmRn+pgZVjvixhsBh57rUasCjaBywXk9BpNj2Foxck\nReHeoDI0RHsgniClyMrYj80y2NhoB6J8NB+cHkhdzIKplm6AH6M5xaAedtZU639a\n1nHMtpDlJhzgIYsiq1q06Aqd1w0Z9tf1RXQ1WvMDhTY4wlE5RZ2epBb6Usnlbjo2\nSqCIGIjRLmZxdsSWoiUUTlVPdUCzTNsN5G/ZVdRswhgseDmVJCIkK2Aji/XzhIrR\nh4RvUv9dhFemOVsFctJ/dQILXz5MZLUgakKf970M5R/Zggv//pqRSsYcB2UfaBpV\nLQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-8.json
+++ b/clients/garage-8.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-8",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt4hXODzgHsIeWxXJm/F6\nSTFJ8JC89mWru7pOFzPWenOVMHgp4UpUB4rDTwQqojsWTDiq0x3ckUyOPw3Nj0jv\nxP4MMGS4SI0oRSJKzrYYss0hgUDTOBBd+Wxn0UiNEpN/PfQo9VZj9v/jak57cz7z\n5+rpl5v27fhgUIChjsHxdy+EamvCrYc+1JhyrLOlwlt8JxkZ8UPhoeZLWAbDgGLS\nEzHWSSVtBUPK+KYmVb2OK4lB56zPfek0U3gKN+04a1650jzOit8LzE6NaT180QDv\nX+gG6tk53vSXDmkBXsQ1mtB8aF+HaEG2Pra5HyihlweCPYdJT+e28wpq6+P5l3YR\ndQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-9.json
+++ b/clients/garage-9.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-9",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnMHzKE8JBrsQkmRDeMjX\n71mBzvRzNM90cwA8xtvIkXesdTyGqohX9k/PJbCY5ySGK9PpMaYDPVAnwnUP8LFQ\n3G98aSbLxUjqU/PBzRsnWpihehr05uz9zYcNFzr4LTNvGQZsq47nN9Tk+LG3zHP7\nAZViv2mJ4ZRnukXf6KHlyoVvhuTu+tiBM8QzjTF97iP/aguNPzYHmrecy9Uf5bSA\nZrbNZT+ayxtgswC2OclhRucx7XLSuHXtpwFqsQzSAhiX1aQ3wwCyH9WJtVwpfUsE\nlxTjcQiSM9aPZ8iSC0shpBaKD1j3iF/2K2Jk+88++zMhJJPLermvaJxzsdePgvyk\nKQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/gitea-2.json
+++ b/clients/gitea-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "gitea-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7MKbO2vvX7TD1cFKjITh\ntvsf6hgAQRcu7F0kiekx15aC3VLnRgsB9A6SXySVrqvhq/vOSTXZsIC62IQi4Oks\nhhtAA/uvwcOmZ7JkMi0vJ3Ary94dTsg/L8i/0/k2V/D4FRKTV4414wSkpglFGLhl\nvbZ6P17LrqfyAzNJwIDzwd9d6cvt4a0qxvuxbTOHkBuY8tpyGdNzhg6fATadxbBa\nRASEVFb+xqxG3K+8zRmaCFyYqmSPS/8liVVbLPAeUlK6pDyQ5g4T37E5o+CpWfPF\nkBgYw/hHQe6zt1Z4wNJ6mb8YIN/l9kFF3EE99laYxp9Ua7ffrZkRgw12C5Yrn3N6\noQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/her.json
+++ b/clients/her.json
@@ -1,4 +0,0 @@
-{
-  "name": "her",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuj7OCWX2qz/WbsjMgpi\nI4CM13Pxrj+8Enrl4IorkK6O338rhdtfXmOJt2AuDuj6u12Xtnk0LN2n01hffXNu\nU0Hwy+szavnbjiqC8jw1nyCFwYgdy8lCj3WV4t/gRWFhiHZGkhBKaksAoo8jJqZv\nXi/4ZuRov01HJgT6CJBEfR5TUaRCHM4hz2Y60mmegmUNLTRUNIDy6rg5W8JplMlJ\ny0dJc6uEp8asKhPnEfMz1kXukjnsBLXZmxglqdAQeaZ1I78QvRV3rYh0Ge2ZPF8t\nv2c+mUMbH7e80lJPgp7rwqjKrjLfaYo/1ZqTqr3ArWw3253ttLp8KX1ltX69nIHq\nMwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ldap-3.json
+++ b/clients/ldap-3.json
@@ -1,4 +0,0 @@
-{
-  "name": "ldap-3",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLndVZtKubbJf2izx6vN\ntU0gwZUhcCz4Dq+Ilu9D8tPVEWUqKp9RyPkSO8iIxdLXJ8ZjtG3oBVPFGka/fW1a\n/SSf4Yn6ArkNhP9dmDKzrOYOuoPF+h+Fa9Jecy2PtNzhGdBdynIK4ezJIdq5vPEG\nAsJf/Ad9EIU8D4Aj/nhNUwfUwsFTTE++LL9yCzRiDHg6pjNToM75V/+fFPk0UL1/\neLcaJzqi5WeXhfq7DbjMtqnt/+vUxO2YAk9MDb3U15hnH4xkxtDfRth1UGkpR/PK\naLn/RTS9sqk3oMZVzDSioXO0TGp00sWDmvpBvEBwlYgWnx1o8JQnkClvn2OSo6va\nzQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ldap-4.json
+++ b/clients/ldap-4.json
@@ -1,4 +0,0 @@
-{
-  "name": "ldap-4",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmzFyZh5/J2BsKRunghis\nwUGbv4j/ynAF7QY+CYoOwDBcbLHk6odn1JyUqCgfhCIX0mh8F/fDKyU9Aw6+HHZ/\nX0DTt/enLTaWc2vxRfyJLRXP7/ymHOr4u6HYEINMdVJp4yQ9XLcWpuRHfA+fHrZ7\n9fI8sCMSEawvVpEKytYdVnm3VCjfIVrfCAkY0lP0mNG908edX2ZuJ4GS1UwADUZX\nLZuMhbGX9JqIQYWCyiMDakD7P7PlEDf/JVkvkao4HQatkqJGmGDhvfIPodIo8JC0\n6FsYxWtvrLJBArYjnVBKRuxIlBqq/7Yx0gj09kGf84aSXvkMDgio7AO4xSp9GJTJ\n4wIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/lq-1.json
+++ b/clients/lq-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "lq-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6mrJdvfx2pvuYIOCwDe4\nXJ4NJSEq+9oyqW/JWNDnUN/GAZLCfTOa+qu1nA8sOspWWpaikHpo2meYlzA1HCPh\nF4LX7C83dA9CXB8BDCddmkAxhPPXIeFM3AmaEwfv+dLYNuO6bWvOKcHjJdw7Mp4W\nrdg9MsIh28W9jf7KehvPWx3ZvrJm2vyiFGQNBDWGdkVq40P2lhvCISvWb+Ugpjos\nJzq/HZNFq6Fc72jWfwwGcDgwfc1/jmWJlz2J5v8xHwwhVtcWTg1AWqfcVQZ6OKtf\nwP6s/pAK4dAXqPz8OE17GPJ42r94AeWr39Cn5b8EzrVhKOeODlpihfzIaa/sfb44\n6wIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/lq-2.json
+++ b/clients/lq-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "lq-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzyquIPPckL4Bybw4H0t6\nHexR7u97//eXBGpN+PJcp3PAUTJVWr1m7uDnpD9JAP370Cp05Tz0ydYXk/2NTpFf\nvRu20401VWTWbClIdN7n89edtER/XX90KrcKplV4bZcFN0UC2Il6SGH0uvUYzZRr\nPV2eXftDvu7Mhl1xlmeJ0S6bH95v1G2k6TrTLAOBs6gpqiCWyjrNB9AY3SpEv9Ya\nK8T0M10LAY0UwKccSp/eTZzCfbmzvNIyyRlJbzEAsHmoDPyR2/4LB1ndtbkTszmk\noHvpBJu3noKXo0SW/WqhSvwxBVV0bZUYjgH3Bx8nudNkHgL6ZH6FVQ6ED+70jWiq\ngwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/mastodon-3.json
+++ b/clients/mastodon-3.json
@@ -1,4 +0,0 @@
-{
-  "name": "mastodon-3",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArBsrwKV1RtDfw/5y/L2N\n/x7UL2q6G4JypcD5Q8/aDQOTaGuTR+4RCup+Zcn2wzpdGnX6IzS7cy4/LqMoR2pB\nq8K1FZOXvcCtwsBqsyGWiFdy5aLXy2CkHhTRbkwOLPyb1rBy+qPCBdr055BPZUWm\nTfJaxTmph+Z1J+INz0YndYxz3iKET2V99OP27D7tUdZ7yPgMDbDJWqVxPdYrmAUr\n3QLpmYWsYlmPKhpTAXlvbvzE5vgh5EC8RGfhfYRpacc6QdwbahtxMQAV9+1S2+Vj\nntHfB6PSnYwewUHs9MMn8e33KmNlOZdMAVlyJymBZ4pNceC44vxvZYElp077A6tN\nFwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/nodejs-4.json
+++ b/clients/nodejs-4.json
@@ -1,4 +0,0 @@
-{
-  "name": "nodejs-4",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIlB6swdT/Z7tRx/Sm24\n/ro3Jotpsi0DiNS6i7BA1fH0OdbX5CRel62jGC1Nja9QCY8aBd00E8u7KPCuK3iY\n5aA7v91sxWZ7nbXdSwBawaNsTZAe4rMaEkA74INpq7TOvLzHcmDcgRbo+MC2Nw3T\nl0mCOaWkUWFaukTLN8zBldzEbYxztKsaL+b2TbevnSCaPkdD9WmDbmjrUiWTlnpE\nDidMjZ9rp+PcODyjlvwka1yJCoPFoN/+ZL4yXxo49tJ2kbrxSh4tdDZqiZwnajRb\n4SAuRCaHTASDSmZ1Dj0ET/miXuvy6Jgvt06eSMPDKvb+84Dk8zLf4CW6DaE2TfX4\nzwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-6.json
+++ b/clients/postgres-6.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-6",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVzM0fwlimmq11jTGTko\nK87LRYSar61tNF3qVWp9axNSMa6BSxVark9eYOqY4eLh/5vJVDqXDFq30/IUWg40\nH8hHWaOEvQrP2dm/XFw1RmunfbfN9gN07TuhaT3xFD5t+jFBuOSoJ4cPnFIABuVt\nFLrjgtYYjtZe5hGE9ZPmS7o2ATM5EU9mxeQ+TkgDbr8StvSPGdZ1ykhagf1pegGU\nRIfZ+4ZKzyDUAq+fYNhIbmlm5h2gP+XdtakPy43j7n0iN1vwDgBqJ2pdaVs/GcFf\nvaztoltguoknI2NPSez1N217asTTLuth0nHxVXiKCVXnqwDjxgWmuP6X2B7VYjyc\nxQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-7.json
+++ b/clients/postgres-7.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-7",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArraIm6mXi0qgK4oWDs2I\nOIx+g/LPnfRd5aBXhoHcekGiJKttQTi5dRdN4+T6qVEC2h4Cc9qN47h2TZPLDh/M\neIZvu0AyicpectzXf6DtDZh0hFCnv47RDi9927op9tjMXk0SV1tLel7MN0dawATw\ny0vQkkr/5a3ZdiP4dFv+bdfVrj+Tuh85BYPVyX2mxq9F7Efxrt6rzVBiqr6uJLUY\nStpeB3CCalC4zQApKX2xrdtr2k8aJbqC6C//LiKbb7VKn+ZuZJ32L/+9HDEzQoFC\no0ZZPMhfnjcU+iSHYZuPMTJTNbwgRuOgpn9O8kZ239qYc59z7HEXwwWiYPDevbiM\nCQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-8.json
+++ b/clients/postgres-8.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-8",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx88DgM/x1UbKRzgPexXE\nSyfrAsqaDVjqZz7yF3tqAc9A52Ol0KOM6NESoPWBVMbS86WtAjBcMHcOoQBJ+ovp\nXcjNlRtO1Il6/d4uCRr4CEDX+yeS0Qrt0SOORnoTbVlkq9VlVljyCmxk8VBCILzk\ndHvFr62mahMy6vOEcpCQgCwYE3ISH2jlTDz2agoK/CjIyyqFTlB1N7mJVGLrJdcA\nA2JOxDRE8HqOdpY7bHcHj4uyMWaKuM3zxXK04lhrvuPRfJUhXgsK9r5jeTEa8407\nqV9K+mB17R1dBeHmWEPDRt02HELe2SUjYmlmyVX73H2mWKDLBFpAFjOfz86CJ6jf\nDQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/redis-1.json
+++ b/clients/redis-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "redis-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7J/jWx6xCoz3ECDA9gr6\nAVVjd3MhE9LmE/bFLdQLariJjyNxJ1qLp/SN1P/H/aBS9YP6HEGkkTekRkWrHkDr\n5pliR9lmdS7c1W2pRKOaBm8r3pl98fBcFtxrkEhlULX5XMUCeGqANjDYeswaKYGb\nYF/OPsL2ZyIzUiejIVoPR9kuCWA8DNa1whgO84r2gMkBSzGu8hAhBoAlXQAoZWWj\nem3sNNwA9X+0WVGuG0X+RxdzNnZ6o28f5UZuDTCuMjJubKM4qg5uuwFtSXHoW8nU\nGl6Y7Owmqsdkh8ZCM8gA4lPu5Kh6XatqQ6Gzq0PXFyCykuXzJRwW4ZVCKC+UyhA0\nQQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/redis-2.json
+++ b/clients/redis-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "redis-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjHtl5iChC5+uxr9YrQu\n3x4zihlVZGk+fYlpbHg2hV880NslRb1MJYFTaKcJrYmgVAnMaKZjfA4fGsWQ3tDl\n/2JcA95U0Soj9BMwr1EUfvna587xS5DnYNCd+OkVtNwqujdoU8Use13UcpwnaN4V\n/9bslQdw2qDeVmeqx7bfTvsATIedWt9eseMR/qnsMd9Rkz/Q3xJ9NgIdQL6cC7uf\nN6H/B+Y+qV5Kv84nwrkTGPyzNOt21mfzeYOiAMGUTUoS+l38hA4ehfVxb8dWTmNa\n8QENbx6DKP5xUEyCiluzFp5jiGJu9xSDngndLVsQ7de5+KvxTjfipczmrWSjPuYB\nXQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rs-discourse-1.json
+++ b/clients/rs-discourse-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "rs-discourse-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApJquhCuRRN/O3rh2QShw\nYxGkEIoBImpVv8uF+VmdPLGQ3fYCO20OSr3y+yk1zGN1aQTEgD7LeCd+U2vBUPAh\nwr2uNkZotIsemkWZIMAPLb9d/2uv/GxBqku0L8JRAxGleHVO5eKsi6w1XdwO00dw\nwgEJa+mju86Vz6hzRzW+KzkdpkcfowH2+BVUV+zuzaR9/mPUiuQXZwSnR+Li4S6j\nR4x/AkRsN/43gzgiBwZz1UdAy6r6ZbUBPm4lZT/QKbURJ+x15swbFHKvR34GvdbT\n2mI15VFvLxr+h4bH5CCswcV4eThzISHGbiN3LZQVpneoWP8BjerFVqx0NfbKDu9t\nsQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-mainnet-3.json
+++ b/clients/rsk-mainnet-3.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-mainnet-3",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdrYfy0Spmt8VETCdUgW\nHbxV3uYA3kn2swvOdIjIR29gNO+t6wWv6FHnV/pfefIweIPaNlr9VMoUejUKX809\ngzdsiVWh1T6s4Yzbbt+O8mF3my5RXiSvizda8c6U65vofBSL2WVzE1AW9v7lXRHX\nJ4auKrpgKWkNLU52QLIP9/X5YLUHQtpTnplO31eb+jSD185aN1qoIxugunxnWSgm\n2NgUPlVbNCFrhv0PVv4Ts10eX6smRX3LKyNBtRRXM3GIrQHlAYRohIpy3lt8tKm4\nE/v9qpXQHvqEmX9FH1/Sonea849cWX3LuxUYLT2XFpaNwUxJK56Ef0HsgZESaxL+\n3QIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-4.json
+++ b/clients/rsk-testnet-4.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-4",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1NgmlPomxGRtu5oyro+m\ndQwBXwrhEuE73aLrUsqGOVSezph6LnETiEMFUIe1weoG+xdcykcUUMt7o1+nKs+E\nl8dxMIgbXAxdpI4n8gOpii70Sh30BDbh8+qZHsKBq32UmkCpz2ViVe/Vb3ViqB3e\n0GIkknPle5G4IC612O8EUkCenwcD1jSXYyug5zWI2T/TwnTuw4JdxfhkMgBM7Y2n\nR1YY6GwAMkK97wE/yBM74+Tiv/6lDy/JDbYmUVcQ55C937oodSWLAEM24EcOOtMA\nKfGumnthbdHzmHjONmLIegD3OJGYC2ulcB9qmaL/7cyIRhf6fEQrBolCH5881fxl\nxwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-5.json
+++ b/clients/rsk-testnet-5.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-5",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/UHlgcSeh9Do7CTCKXC\n/4/aO2OvT+ijDVmrMYCNtE4sMeuFqKPnV1zxJZmRm4VNhkSQDkdWYD+6XvuFYW60\nyjB/N6D5lLlyjG4HD6fTkfh0K6f7t5mOYV7o4T59OoA3cBZuSROjtWmJ8jEFJ+k9\nII2kcyhPQcFN01ckzvZKRSPbVRccMoc+AKTjB3ZUfs/ERtlVoDrK4jEHluXOxUJO\nBKCcLonjJuLlpRLh7QfKrKFcR4idn5Ir43R6aSUesI/ipKwKsXnR3Bu7vXp74VF3\nMJ3EkdSBG+qJzy51fbRfQiUPAr/vSoVQZwW7FkIhIqqLkMaYCymn7qKfTGujoNU7\nlwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/sentry-1.json
+++ b/clients/sentry-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "sentry-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtZFwP58ym+92YFa0adU3\nVGEJW13NkfaHChx+akB3IioSPKyJ9eOXEI8pOmU3QyqOUKSbqth78DY84hobXlqs\n4O0A7TV029uepcj5zPN047gDsV1TJ6Dakma5eH+Pe5kP/TigCEOF0Cgo+fqtEBEJ\nT/rhSs3zHD1EfBnZdyj/7YyeDv1XLWI8dXoizDUAoBSCDeJ5d7fG56zmFYLV05Ex\nMrjJuHitEmeJXTZABKstRbEd+3Rld+gfJZ/jI4djEW2j1EKAYMT1SxoXdjKlCrpQ\nGux2RSe+Gspt1hyp/flU5gHGO+qLDNSU9tZInClToyFMVBfoW8kWg28Gm2kGkIvr\npQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/strfry-1.json
+++ b/clients/strfry-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "strfry-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDV/RMGMXVDbvoA6PNh8\nQzhtHwYDCFcUSkbrwP6tzh6GpVunGEOdOdhj2V63T2tF1H+lujxQXh5pK7C0D6VZ\niO04ftJlo7/svyxUcwWr+znyN5sFdQRh3cBZiGSBYolizwoqgtPFlbNhmWAzV0Du\n9t8mhz70IK3B+UdwWyHtoK0NNsJGnQ9YzAvcjyDmEO/3sCjAhNnxVpmXftpcSmd9\nMonzFtIDBbRRll4AHZYRbmXCzx63+VmelvdnufnbY82liol0zzBwJaBD1wyNlG0y\ni96p3Kx03bLNlIaYVGbjZeJi+6oo2VDWJ4OloLLAYoHDSipeHT9qWfUdnE6ge4Lm\nywIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/test-2.json
+++ b/clients/test-2.json
@@ -0,0 +1,4 @@
+{
+  "name": "test-2",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyU+Pg4svFeiLc4/OogiZ\n45MgXWMT7/S28R5lDQ3QwCc4c3mGEfkoiOzBmPpf/JuTIRO6W8hsXQNm5Wr3jGYa\nIKHtfSqNufLievLxymR781Grkzxsy8GefeUajNn0Nypjs4ACso2rdX3KmQ/xJr4n\nFKk6Jj08Fp/7i7kzgC8WA6ZeuVPRw9PODTof7x1BMoTfUXaGPPEIVxtv7cZBdkp1\nQK3F2A8nokqDo3630iOq/P29h80STGmeH8hjpICTGxYDOR/vvp7Zs7z8aueZ6iUT\n3oit8w+gAI4RTgu4bgPbwsh5nfIXZaJeSVrV6zpPO5usMbWWDJgdbhwbAGGYVSFp\nEQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/cookbooks/application/CHANGELOG.md
+++ b/cookbooks/application/CHANGELOG.md
@@ -0,0 +1,101 @@
+# Application Changelog
+
+## v5.2.0
+
+* Add `application_directory` resource.
+* Chef 13 compatibility.
+
+## v5.1.0
+
+* Add `application_cookbook_file`, `application_file`, and `application_template` resources.
+
+## v5.0.0
+
+* Massive rewrite on top of newer Chef patterns. See the 5.0 README for details.
+
+## v4.1.6
+
+* Support for Chef 12.
+* Add `strict_ssh` option to enable host key checking.
+* Add `keep_releases` option to control number of releases to keep.
+* Allow passing a path to a file for `deploy_key`.
+
+## v4.1.4
+
+* [COOK-3343](https://tickets.opscode.com/browse/COOK-3343) - Can't parse release candidate version number.
+
+## v4.1.2
+
+* [COOK-3343](https://tickets.opscode.com/browse/COOK-3343) - Can't parse release candidate version number.
+
+## v4.1.0
+
+* [COOK-3343] - Can't parse release candidate version number.
+
+## v4.0.0
+
+* Removes compatability with Chef 10.
+* [COOK-3564](https://tickets.opscode.com/browse/COOK-3564) - Replace calls to `Chef::Mixin::RecipeDefinitionDSLCore`.
+
+## v3.0.0
+
+* [COOK-3306]: Multiple Memory Leaks in Application Cookbook.
+
+## v2.0.4
+
+* [COOK-2812]: application cookbook doesn't allow to specify a block as `restart_command`.
+
+## v2.0.2
+
+* [COOK-2537]: Provide proper `respond_to` behavior when using `method_missing`.
+* [COOK-2713]: application resource should Allow sub-resource attributes to propogate up.
+
+### Improvement
+* [COOK-2597]: Allow customization for `shallow_clone` when doing a git deploy.
+
+## v2.0.0
+
+This release is incompatible with previous releases (hence major version change). The recipes used in older versions are deprecated and completely removed. See README.md for further detail.
+
+* [COOK-1673] - `deploy_revision` in the application cookbook gives an argument error.
+* [COOK-1820] - Application cookbook: remove deprecated recipes.
+
+## v1.0.4
+
+* [COOK-1567] - Add git submodules to application cookbook.
+
+## v1.0.2
+
+* [COOK-1312] - string callbacks fail with method not found (really included this time).
+* [COOK-1332] - add `release_path` and `shared_path` methods.
+* [COOK-1333] - add example for running migrations.
+* [COOK-1360] - fix minor typos in README.
+* [COOK-1374] - use runit attributes in unicorn run script.
+
+## v1.0.0
+
+This release introduces the LWRP for application deployment, as well as other improvements. The recipes will be deprecated in August 2012 as indicated by their warning messages and in the README.md.
+
+* [COOK-634] - Implement LWRP for application deployment.
+* [COOK-1116] - use other SCMs than git.
+* [COOK-1252] - add `:force_deploy` that maps to corresponding action of deploy resource.
+* [COOK-1253] - fix rollback error.
+* [COOK-1312] - string callbacks fail with method not found.
+* [COOK-1313] - implicit file based hooks aren't invoked.
+* [COOK-1318] - Create `to_ary` method to resolve issue in resources() lookup on "application[foo]" resources.
+
+## v0.99.14
+
+* [COOK-1065] - use pip in virtualenv during deploy.
+
+## v0.99.12
+
+* [COOK-606] application cookbook deployment recipes should use ipaddress instead of fqdn.
+
+## v0.99.11
+
+* make the `_default` `chef_environment` look like production rails env.
+
+## v0.99.10
+
+* Use Chef 0.10's `node.chef_environment` instead of `node['app_environment']`.
--- a/cookbooks/application/README.md
+++ b/cookbooks/application/README.md
@@ -0,0 +1,260 @@
+# Application cookbook
+
+[![Build Status](https://img.shields.io/travis/poise/application.svg)](https://travis-ci.org/poise/application)
+[![Gem Version](https://img.shields.io/gem/v/poise-application.svg)](https://rubygems.org/gems/poise-application)
+[![Cookbook Version](https://img.shields.io/cookbook/v/application.svg)](https://supermarket.chef.io/cookbooks/application)
+[![Coverage](https://img.shields.io/codeclimate/coverage/github/poise/application.svg)](https://codeclimate.com/github/poise/application)
+[![Gemnasium](https://img.shields.io/gemnasium/poise/application.svg)](https://gemnasium.com/poise/application)
+[![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+
+A [Chef](https://www.chef.io/) cookbook to deploy applications.
+
+## Getting Started
+
+The application cookbook provides a central framework to deploy applications
+using Chef. Generally this will be web applications using things like Rails,
+Django, or NodeJS, but the framework makes no specific assumptions. The core
+`application` resource provides DSL support and helpers, but the heavy lifting
+is all done in specific plugins detailed below. Each deployment starts with
+an `application` resource:
+
+```ruby
+application '/path/to/deploy' do
+  owner 'root'
+  group 'root'
+
+  # ...
+end
+```
+
+The `application` resource uses the Poise subresource system for plugins. This
+means you configure the steps of the deployment like normal recipe code inside
+the `application` resource, with a few special additions:
+
+```ruby
+application '/path/to/deploy' do
+  # Application resource properties.
+  owner 'root'
+  group 'root'
+
+  # Subresources, like normal recipe code.
+  package 'ruby'
+  git '/path/to/deploy' do
+    repository 'https://github.com/example/myapp.git'
+  end
+  application_rails '/path/to/deploy' do
+    database 'mysql://dbhost/myapp'
+  end
+end
+```
+
+When evaluating the recipe inside the `application` resource, it first checks
+for `application_#{resource}`, as well as looking for an LWRP of the same name
+in any cookbook starting with `application_`. This means that a resource named
+`application_foo` can be used as `foo` inside the `application` resource:
+
+```ruby
+application '/path/to/deploy' do
+  owner 'root'
+  group 'root'
+
+  rails '/path/to/deploy' do
+    database 'mysql://dbhost/myapp'
+  end
+end
+```
+
+Additionally if a resource inside the `application` block doesn't have a name,
+it uses the same name as the application resource itself:
+
+```ruby
+application '/path/to/deploy' do
+  owner 'root'
+  group 'root'
+
+  rails do
+    database 'mysql://dbhost/myapp'
+  end
+end
+```
+
+Other than those two special features, the recipe code inside the `application`
+resource is processed just like any other recipe.
+
+## Available Plugins
+
+* [`application_git`](https://github.com/poise/application_git) – Deploy
+  application code from a git repository.
+* [`application_ruby`](https://github.com/poise/application_ruby) – Manage Ruby
+  deployments, such as Rails or Sinatra applications.
+* [`application_python`](https://github.com/poise/application_python) – Manage
+  Python deployments, such as Django or Flask applications.
+* [`application_javascript`](https://github.com/poise/application_javascript) –
+  Manage server-side JavaScript deployments using Node.js or io.js.
+* `application_java` – *Coming soon!*
+* `application_go` – *Coming soon!*
+* `application_erlang` – *Coming soon!*
+
+## Requirements
+
+Chef 12 or newer is required.
+
+## Resources
+
+### `application`
+
+The `application` resource has top-level configuration properties for each
+deployment and acts as a container for other deployment plugin resources.
+
+```ruby
+application '/opt/test_sinatra' do
+  git 'https://github.com/example/my_sinatra_app.git'
+  bundle_install do
+    deployment true
+  end
+  unicorn do
+    port 9000
+  end
+end
+```
+
+#### Actions
+
+* `:deploy` – Deploy the application. *(default)*
+* `:start` - Run `:start` on all subresources that support it.
+* `:stop` - Run `:stop` on all subresources that support it.
+* `:restart` - Run `:restart` on all subresources that support it.
+* `:reload` - Run `:reload` on all subresources that support it.
+
+#### Properties
+
+* `path` – Path to deploy the application to. *(name attribute)*
+* `environment` – Environment variables for all application deployment steps.
+* `group` – System group to deploy the application as.
+* `owner` – System user to deploy the application as.
+* `action_on_update` – Action to run on the application resource when any
+  subresource is updated. *(default: restart)*
+* `action_on_update_immediately` – Run the `action_on_update` notification with
+  `:immediately`. *(default: false)*
+
+### `application_cookbook_file`, `application_directory`, `application_file`, `application_template`
+
+The `application_cookbook_file`, `application_directory`, `application_file`, and `application_template`
+resources extend the core Chef resources to take some application-level
+configuration in to account:
+
+```ruby
+application '/opt/myapp' do
+  template 'myapp.conf' do
+    source 'myapp.conf.erb'
+  end
+  directory 'logs'
+end
+```
+
+If the resource name is a relative path, it will be expanded relative to the
+application path. If an owner or group is declared for the application, those
+will be the default user and group for the resource.
+
+All other actions and properties are the same as the similar resource in core Chef.
+
+## Examples
+
+Some test recipes are available as examples for common application frameworks:
+
+* [Sinatra](https://github.com/poise/application_ruby/blob/master/test/cookbooks/application_ruby_test/recipes/sinatra.rb)
+* [Rails](https://github.com/poise/application_ruby/blob/master/test/cookbooks/application_ruby_test/recipes/rails.rb)
+* [Flask](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/flask.rb)
+* [Django](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/django.rb)
+* [Express](https://github.com/poise/application_javascript/blob/master/test/cookbook/recipes/express.rb)
+
+## Upgrading From 4.x
+
+While the overall design of the revamped application resource is similar to the
+4.x version, some changes will need to be made. The `name` property no longer
+exists, with the name attribute being used as the path to the deployment.
+The `packages` property has been removed as this is more easily handled via
+normal recipe code.
+
+The SCM-related properties like `repository` and `revision` are now handled by
+normal plugins. If you were deploying from a private git repository you will
+likely want to use the `application_git` cookbook, otherwise just use the
+built-in `git` or `svn` resources as per normal.
+
+The properties related to the `deploy` resource like `strategy` and `symlinks`
+have been removed. The `deploy` resource is no longer used so these aren't
+relevant. As a side effect of this, you'll likely want to point the upgraded
+deployment at a new folder or manually clean the `current` and `shared` folders
+from the existing folder. The pseudo-Capistrano layout used by the `deploy`
+resource has few benefits in a config-managed world and introduced a lot of
+complexity and moving pieces that are no longer required.
+
+With the removal of the `deploy` resource, the callback properties and commands
+are no longer used as well. Subresources no longer use the complex
+actions-as-callbacks arrangement as existed before, instead following normal
+Chef recipe flow. Individual subresources may need to be tweaked to work with
+newer versions of the cookbooks they come from, though most have stayed similar
+in overall approach.
+
+## Database Migrations and Chef
+
+Several of the web application deployment plugins include optional support to
+run database migrations from Chef. For "toy" applications where the app and
+database run together on a single machine, this is fine and is a nice time
+saver. For anything more complex I highly recommend not running database
+migrations from Chef. Some initial operations like creating the database and/or
+database user are more reasonable as they tend to be done only once and by their
+nature the application does not yet have users so some level of eventual
+consistency is more acceptable. With migrations on a production application, I
+encourage using Chef and the application cookbooks to handle deploying the code
+and writing configuration files, but use something more specific to run the
+actual migration task. [Fabric](http://www.fabfile.org/),
+[Capistrano](http://capistranorb.com/), and [Rundeck](http://rundeck.org/) are
+all good choices for this orchestration tooling.
+
+Migrations can generally be applied idempotently but they have unique
+constraints (pun definitely intended) that make them tricky in a Chef-like,
+convergence-based system. First and foremost is that many table alterations
+lock the table for updating for at least some period of time. That can mean that
+while staging the new code or configuration data can happen within a window, the
+migration itself needs to be run in careful lockstep with the rest of the
+deployment process (eg. moving things in and out of load balancers). Beyond
+that, while most web frameworks have internal idempotence checks for migrations,
+running the process on two servers at the same time can have unexpected effects.
+
+Overall migrations are best thought of as a procedural step rather than a
+declaratively modeled piece of the system.
+
+## Application Signals and Updates
+
+The `application` resource exposes `start`, `stop`, `restart`, and `reload`
+actions which will dispatch to any subresources attached to the application.
+This allows for generic application-level restart or reload signals that will
+work with any type of deployment.
+
+Additionally the `action_on_update` property is used to set a default
+notification so any subresource that updates will trigger an application
+restart or reload. This can be disabled by setting `action_on_update false` if
+you want to take manual control of service restarts.
+
+## Sponsors
+
+Development sponsored by [Chef Software](https://www.chef.io/), [Symonds & Son](http://symondsandson.com/), and [Orion](https://www.orionlabs.co/).
+
+The Poise test server infrastructure is sponsored by [Rackspace](https://rackspace.com/).
+
+## License
+
+Copyright 2015-2016, Noah Kantrowitz
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/cookbooks/application/files/halite_gem/poise_application.rb
+++ b/cookbooks/application/files/halite_gem/poise_application.rb
@@ -0,0 +1,25 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+module PoiseApplication
+  autoload :AppMixin, 'poise_application/app_mixin'
+  autoload :Error, 'poise_application/error'
+  autoload :Resources, 'poise_application/resources'
+  autoload :ServiceMixin, 'poise_application/service_mixin'
+  autoload :Utils, 'poise_application/utils'
+  autoload :VERSION, 'poise_application/version'
+end
--- a/cookbooks/application/files/halite_gem/poise_application/app_file_mixin.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/app_file_mixin.rb
@@ -0,0 +1,64 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise/utils'
+
+require 'poise_application/app_mixin'
+
+
+module PoiseApplication
+  # A helper mixin for `file`-like resources to make them take application
+  # resource data. Relative paths are expanded against the application path and
+  # the app owner/group are the default user/group for the resource.
+  #
+  # @api private
+  # @since 5.1.0
+  module AppFileMixin
+    include Poise::Utils::ResourceProviderMixin
+
+    module Resource
+      include PoiseApplication::AppMixin
+
+      def initialize(*)
+        super
+        # So our lazy default below can work. Not needed on 12.7+.
+        remove_instance_variable(:@path) if instance_variable_defined?(:@path)
+      end
+
+      # @!attribute path
+      #   Override the default path to be relative to the app path.
+      #   @return [String]
+      attribute(:path, kind_of: String, default: lazy { parent ? ::File.expand_path(name, parent.path) : name })
+
+      # @!attribute group
+      #   Override the default group to be the app group if unspecified.
+      #   @return [String, Integer]
+      attribute(:group, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.group })
+
+      # @!attribute owner
+      #   Override the default user to be the app owner if unspecified.
+      #   @return [String, Integer]
+      attribute(:owner, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.owner })
+
+      # For the forgetful.
+      alias_method :user, :owner
+    end
+
+    module Provider
+      include PoiseApplication::AppMixin
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/app_mixin.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/app_mixin.rb
@@ -0,0 +1,69 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/mash'
+require 'poise/provider'
+require 'poise/resource'
+require 'poise/utils'
+
+
+module PoiseApplication
+  # A helper mixin for application resources and providers. These are things
+  # intended to be used as subresources of the `application` resource.
+  #
+  # @since 5.0.0
+  module AppMixin
+    include Poise::Utils::ResourceProviderMixin
+
+    # A helper mixin for application resources.
+    module Resource
+      include Poise::Resource
+
+      # Set the parent type and optional flag.
+      poise_subresource(:application, true)
+
+      # @!attribute path
+      #   Base path for the application.
+      #   @return [String]
+      attribute(:path, kind_of: String, name_attribute: true)
+
+      # A delegator for accessing the application state. If no application
+      # parent is found, the state will be tracked internally within the
+      # resource.
+      #
+      # @return [Hash<Symbol, Object>]
+      def app_state
+        if parent
+          parent.app_state
+        else
+          # If there isn't a parent, just track within the resource.
+          @local_app_state ||= Mash.new
+        end
+      end
+
+      # Environment variables stored in the application state.
+      #
+      # @return [Hash<String, String>]
+      def app_state_environment
+        app_state[:environment] ||= Mash.new
+      end
+    end
+
+    module Provider
+      include Poise::Provider
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/cheftie.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/cheftie.rb
@@ -0,0 +1,17 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/resources'
--- a/cookbooks/application/files/halite_gem/poise_application/error.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/error.rb
@@ -0,0 +1,24 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+module PoiseApplication
+  # Base exception class for poise-application errors.
+  #
+  # @since 5.0.0
+  class Error < Exception
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources.rb
@@ -0,0 +1,30 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/resources/application'
+require 'poise_application/resources/application_cookbook_file'
+require 'poise_application/resources/application_directory'
+require 'poise_application/resources/application_file'
+require 'poise_application/resources/application_template'
+
+
+module PoiseApplication
+  # Chef resources and providers for poise-application.
+  #
+  # @since 5.0.0
+  module Resources
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources/application.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources/application.rb
@@ -0,0 +1,259 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/dsl/recipe' # On 12.4+ this will pull in chef/dsl/resources.
+require 'chef/resource'
+require 'chef/provider'
+require 'poise'
+
+
+module PoiseApplication
+  module Resources
+    # (see Application::Resource)
+    # @since 5.0.0
+    module Application
+      # An `application` resource to manage application deployment.
+      #
+      # @since 5.0.0
+      # @provides application
+      # @action deploy
+      # @action start
+      # @action stop
+      # @action restart
+      # @action reload
+      # @example
+      #   application '/srv/myapp' do
+      #     git '...'
+      #     poise_service 'myapp' do
+      #       command '/srv/myapp/main'
+      #     end
+      #   end
+      class Resource < Chef::Resource
+        include Poise(container: true, container_namespace: false)
+        provides(:application)
+        actions(:deploy, :start, :stop, :restart, :reload)
+
+        # @!attribute path
+        #   Application base path.
+        #   @return [String]
+        attribute(:path, kind_of: String, name_attribute: true)
+        # @!attribute environment
+        #   Environment variables to set for the whole application.
+        #   @return [Hash<String, String>]
+        attribute(:environment, kind_of: Hash, default: lazy { Mash.new })
+        # @!attribute owner
+        #   System user that will own the application. This can be overriden in
+        #   individual subresources.
+        #   @return [String]
+        attribute(:owner, kind_of: String)
+        # @!attribute group
+        #   System group that will own the application. This can be overriden in
+        #   individual subresources.
+        #   @return [String]
+        attribute(:group, kind_of: String)
+        # @!attribute action_on_update
+        #   Action to run when any subresource is updated. Defaults to `:restart`.
+        #   @return [String, Symbol, nil, false]
+        attribute(:action_on_update, kind_of: [Symbol, String, NilClass, FalseClass], default: :restart)
+        # @!attribute action_on_update_immediately
+        #   Run the {#action_on_update} notification with `:immediately`.
+        #   @return [Boolean]
+        attribute(:action_on_update_immediately, equal_to: [true, false], default: false)
+
+        # Run the DSL rewire when the resource object is created.
+        # @api private
+        def initialize(*args)
+          super
+          _rewire_dsl! if node
+        end
+
+        # Application-specific state values used as a way to communicate between
+        # subresources.
+        #
+        # @return [Mash]
+        # @example
+        #   if new_resource.parent && new_resource.parent.app_state['gemfile_path']
+        def app_state
+          @app_state ||= Mash.new(environment: environment)
+        end
+
+        # Override Container#register_subresource to add our action_on_update.
+        #
+        # @api private
+        def register_subresource(resource)
+          super.tap do |added|
+            if added && action_on_update
+              Chef::Log.debug("[#{self}] Registering #{action_on_update_immediately ? 'immediate ' : ''}#{action_on_update} notification from #{resource}")
+              resource.notifies action_on_update.to_sym, self, (action_on_update_immediately ? :immediately : :delayed)
+            end
+          end
+        end
+
+        private
+
+        # Find all resources that need to be rewired. This is anything with a
+        # name starting with application_.
+        #
+        # @return [Array<String>]
+        def _rewire_resources
+          if defined?(Chef::DSL::Resources)
+            # Chef >= 12.4.
+            Chef::DSL::Resources.instance_methods
+          else
+            # Chef < 12.4 >= 12.0.
+            Chef::Resource.descendants.map do |klass|
+              klass.node_map.instance_variable_get(:@map).keys + if klass.dsl_name.include?('::')
+                # Probably not valid.
+                # :nocov:
+                []
+                # :nocov:
+              else
+                # Needed for things that don't call provides().
+                [klass.dsl_name]
+              end
+            end.flatten
+          end.map {|name| name.to_s }.select {|name| name.start_with?('application_') }.uniq
+        end
+
+        # Find all cookbooks that might contain LWRPs matching our name scheme.
+        #
+        # @return [Array<String>]
+        def _rewire_cookbooks
+          # Run context might be unset during test setup.
+          if run_context
+            run_context.cookbook_collection.keys.select {|cookbook_name| cookbook_name.start_with?('application_') }
+          else
+            []
+          end
+        end
+
+        # Build the mapping of new_name => old_name for each resource to rewire.
+        #
+        # @return [Hash<String, String>]
+        def _rewire_map
+          application_cookbooks = _rewire_cookbooks
+          _rewire_resources.inject({}) do |memo, name|
+            # Grab the resource class to check if it is an LWRP.
+            klass = Chef::Resource.resource_for_node(name.to_sym, node)
+            # Find the part to trim. Check for LWRP first, then just application_.
+            trim = if klass < Chef::Resource::LWRPBase
+              application_cookbooks.find {|cookbook_name| name.start_with?(cookbook_name) && name != cookbook_name } || 'application'
+            else
+              # Non-LWRPs are assumed to have a better name.
+              'application'
+            end
+            # Map trimmed to untrimmed.
+            memo[name[trim.length+1..-1]] = name
+            memo
+          end
+        end
+
+        # Build new DSL methods to implement the foo -> application_foo behavior.
+        #
+        # @return [void]
+        def _rewire_dsl!
+          # Generate stub methods for all the rewiring.
+          _rewire_map.each do |new_name, old_name|
+            # This is defined as a singleton method on self so it looks like
+            # the DSL but is scoped to just this context.
+            define_singleton_method(new_name) do |name=nil, *args, &block|
+              # Store the caller to correct the source_line.
+              created_at = caller[0]
+              public_send(old_name, name, *args) do
+                # Set the declared type to be the native name.
+                self.declared_type = self.class.resource_name
+                # Fix the source location. For Chef 12.4 we could do this with the
+                # declared_at parameter on the initial send.
+                self.source_line = created_at
+                # Run the original block.
+                instance_exec(&block) if block
+              end
+            end
+          end
+        end
+      end
+
+      # Provider for `application`.
+      #
+      # @since 5.0.0
+      # @see Resource
+      # @provides application
+      class Provider < Chef::Provider
+        include Poise
+        provides(:application)
+
+        # `deploy` action for `application`. Creates the application base folder.
+        #
+        # @return [void]
+        def action_deploy
+          notifying_block do
+            directory new_resource.path do
+              owner new_resource.owner
+              group new_resource.group
+              mode '755'
+            end
+          end
+        end
+
+        # `start` action for `application`. Proxies to subresources.
+        #
+        # @return [void]
+        def action_start
+          proxy_action(:start)
+        end
+
+        # `stop` action for `application`. Proxies to subresources.
+        #
+        # @return [void]
+        def action_stop
+          proxy_action(:stop)
+        end
+
+        # `restart` action for `application`. Proxies to subresources.
+        #
+        # @return [void]
+        def action_restart
+          proxy_action(:restart)
+        end
+
+        # `reload` action for `application`. Proxies to subresources.
+        #
+        # @return [void]
+        def action_reload
+          proxy_action(:reload)
+        end
+
+        private
+
+        # Proxy an action to any subresources that support it.
+        #
+        # @param action [Symbol] Action to proxy.
+        # @return [void]
+        def proxy_action(action)
+          Chef::Log.debug("[#{new_resource} Running proxied #{action} action")
+          new_resource.subresources.each do |r|
+            begin
+              r.run_action(action) if r.allowed_actions.include?(action)
+            rescue Chef::Exceptions::UnsupportedAction
+              # Don't care, just move on.
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources/application_cookbook_file.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources/application_cookbook_file.rb
@@ -0,0 +1,54 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/app_file_mixin'
+
+
+module PoiseApplication
+  module Resources
+    # (see ApplicationCookbookFile::Resource)
+    # @since 5.1.0
+    module ApplicationCookbookFile
+      # An `application_cookbook_file` resource to manage Chef cookbook_files inside and
+      # Application cookbook deployment.
+      #
+      # @provides application_cookbook_file
+      # @action create
+      # @action create_if_missing
+      # @action delete
+      # @action touch
+      # @example
+      #   application '/srv/myapp' do
+      #     cookbook_file 'myapp.conf' do
+      #       source 'myapp.conf'
+      #     end
+      #   end
+      class Resource < Chef::Resource::CookbookFile
+        include PoiseApplication::AppFileMixin
+        provides(:application_cookbook_file)
+        actions(:create, :create_if_missing, :delete, :touch)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_cookbook_file
+        end
+      end
+
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources/application_directory.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources/application_directory.rb
@@ -0,0 +1,50 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/app_file_mixin'
+
+
+module PoiseApplication
+  module Resources
+    # (see ApplicationDirectory::Resource)
+    # @since 5.1.0
+    module ApplicationDirectory
+      # An `application_directory` resource to manage Chef files inside and
+      # Application cookbook deployment.
+      #
+      # @provides application_directory
+      # @action create
+      # @action delete
+      # @example
+      #   application '/srv/myapp' do
+      #     directory 'logs'
+      #   end
+      class Resource < Chef::Resource::Directory
+        include PoiseApplication::AppFileMixin
+        provides(:application_directory)
+        actions(:create, :delete)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_directory
+        end
+      end
+
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources/application_file.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources/application_file.rb
@@ -0,0 +1,54 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/app_file_mixin'
+
+
+module PoiseApplication
+  module Resources
+    # (see ApplicationFile::Resource)
+    # @since 5.1.0
+    module ApplicationFile
+      # An `application_file` resource to manage Chef files inside and
+      # Application cookbook deployment.
+      #
+      # @provides application_file
+      # @action create
+      # @action create_if_missing
+      # @action delete
+      # @action touch
+      # @example
+      #   application '/srv/myapp' do
+      #     file 'myapp.conf' do
+      #       source 'myapp.conf.erb'
+      #     end
+      #   end
+      class Resource < Chef::Resource::File
+        include PoiseApplication::AppFileMixin
+        provides(:application_file)
+        actions(:create, :create_if_missing, :delete, :touch)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_file
+        end
+      end
+
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/resources/application_template.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/resources/application_template.rb
@@ -0,0 +1,54 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/app_file_mixin'
+
+
+module PoiseApplication
+  module Resources
+    # (see ApplicationTemplate::Resource)
+    # @since 5.1.0
+    module ApplicationTemplate
+      # An `application_template` resource to manage Chef templates inside and
+      # Application cookbook deployment.
+      #
+      # @provides application_template
+      # @action create
+      # @action create_if_missing
+      # @action delete
+      # @action touch
+      # @example
+      #   application '/srv/myapp' do
+      #     template 'myapp.conf' do
+      #       source 'myapp.conf.erb'
+      #     end
+      #   end
+      class Resource < Chef::Resource::Template
+        include PoiseApplication::AppFileMixin
+        provides(:application_template)
+        actions(:create, :create_if_missing, :delete, :touch)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_template
+        end
+      end
+
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/service_mixin.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/service_mixin.rb
@@ -0,0 +1,116 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/resource'
+require 'chef/provider'
+require 'poise/utils'
+require 'poise_service/service_mixin'
+require 'poise_service/utils'
+
+require 'poise_application/app_mixin'
+require 'poise_application/utils'
+
+
+module PoiseApplication
+  # Mixin for application services. This is any resource that will be part of
+  # an application deployment and involves running a persistent service.
+  #
+  # @api public
+  # @since 5.0.0
+  # @example
+  #   module MyApp
+  #     class Resource < Chef::Resource
+  #       include Poise
+  #       provides(:my_app)
+  #       include PoiseApplication::ServiceMixin
+  #     end
+  #
+  #     class Provider < Chef::Provider
+  #       include Poise
+  #       provides(:my_app)
+  #       include PoiseApplication::ServiceMixin
+  #
+  #       def action_enable
+  #         notifying_block do
+  #           template '/etc/myapp.conf' do
+  #             # ...
+  #           end
+  #         end
+  #         super
+  #       end
+  #
+  #       def service_options(r)
+  #         super
+  #         r.command('myapp --serve')
+  #       end
+  #     end
+  #   end
+  module ServiceMixin
+    include Poise::Utils::ResourceProviderMixin
+
+    # Mixin for application service resources.
+    #
+    # @see ServiceMixin
+    module Resource
+      include PoiseService::ServiceMixin::Resource
+      include PoiseApplication::AppMixin::Resource
+
+      module ClassMethods
+        # @api private
+        def included(klass)
+          super
+          klass.extend(ClassMethods)
+          klass.class_exec do
+            attribute(:path, kind_of: String, name_attribute: true)
+            # Redefines from the PoiseService version so we get a better default.
+            attribute(:service_name, kind_of: String, default: lazy { PoiseService::Utils.parse_service_name(path) })
+            attribute(:user, kind_of: [String, Integer], default: lazy { parent ? parent.owner : 'root' })
+          end
+        end
+      end
+
+      extend ClassMethods
+    end
+
+    # Mixin for application service providers.
+    #
+    # @see ServiceMixin
+    module Provider
+      include PoiseService::ServiceMixin::Provider
+      include PoiseApplication::AppMixin::Provider
+
+      private
+
+      # Abstract hook to set parameters on {#service_resource} when it is
+      # created. This is required to set at least `resource.command`.
+      #
+      # @api public
+      # @param resource [Chef::Resource] Resource instance to set parameters on.
+      # @return [void]
+      # @example
+      #   def service_options(resource)
+      #     super
+      #     resource.command('myapp --serve')
+      #   end
+      def service_options(resource)
+        super
+        resource.directory(new_resource.path)
+        resource.user(new_resource.user)
+        resource.environment.update(new_resource.app_state_environment) if new_resource.parent
+      end
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/utils.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/utils.rb
@@ -0,0 +1,51 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'etc'
+
+
+module PoiseApplication
+  # Utility methods for PoiseApplication.
+  #
+  # @api public
+  # @since 5.0.0
+  module Utils
+    # Methods are also available as module-level methods as well as a mixin.
+    extend self
+
+    # Try to find the primary group name for a given user.
+    #
+    # @param user [String, Integer] User to check, if given as an integer this
+    #   is used as a UID, otherwise it is the username.
+    # @return [String]
+    # @example
+    #   attribute(:group, kind_of: [String, Integer], default: lazy { PoiseApplication::Utils.primary_group_for(user) })
+    def primary_group_for(user)
+       # Force a reload in case any users were created earlier in the run.
+      Etc.endpwent
+      Etc.endgrent
+      user = if user.is_a?(Integer)
+        Etc.getpwuid(user)
+      else
+        Etc.getpwnam(user.to_s)
+      end
+      Etc.getgrgid(user.gid).name
+    rescue ArgumentError
+      # One of the get* calls exploded. ¯\_(ツ)_/¯
+      user.to_s
+    end
+  end
+end
--- a/cookbooks/application/files/halite_gem/poise_application/version.rb
+++ b/cookbooks/application/files/halite_gem/poise_application/version.rb
@@ -1,12 +1,11 @@
 #
-# Cookbook:: selinux
-# Recipe:: permissive
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +14,7 @@
 # limitations under the License.
 #

-selinux_install 'selinux'

-selinux_state 'permissive' do
-  automatic_reboot true
-  action :permissive
+module PoiseApplication
+  VERSION = '5.2.0'
 end
--- a/cookbooks/application/libraries/default.rb
+++ b/cookbooks/application/libraries/default.rb
@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)
+require "poise_application/cheftie"
--- a/cookbooks/application/metadata.json
+++ b/cookbooks/application/metadata.json
--- a/cookbooks/application_git/CHANGELOG.md
+++ b/cookbooks/application_git/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Application_Git Changelog
+
+## v1.1.0
+
+* [#2](https://github.com/poise/application_git/issues/2) – Inherit user and group values from the parent `application` resource.
+* [#3](https://github.com/poise/application_git/issues/3) – Fix usage with users created during the current Chef run.
+
+## v1.0.0
+
+* Initial release.
--- a/cookbooks/application_git/README.md
+++ b/cookbooks/application_git/README.md
@@ -0,0 +1,108 @@
+# Application_Git Cookbook
+
+[![Build Status](https://img.shields.io/travis/poise/application_git.svg)](https://travis-ci.org/poise/application_git)
+[![Gem Version](https://img.shields.io/gem/v/poise-application-git.svg)](https://rubygems.org/gems/poise-application-git)
+[![Cookbook Version](https://img.shields.io/cookbook/v/application_git.svg)](https://supermarket.chef.io/cookbooks/application_git)
+[![Coverage](https://img.shields.io/codecov/c/github/poise/application_git.svg)](https://codecov.io/github/poise/application_git)
+[![Gemnasium](https://img.shields.io/gemnasium/poise/application_git.svg)](https://gemnasium.com/poise/application_git)
+[![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+
+A [Chef](https://www.chef.io/) cookbook to handle deploying code from git when
+using the [application cookbook](https://github.com/poise/application).
+
+## Quick Start
+
+To deploy from a private GitHub repository:
+
+```ruby
+application '/srv/myapp' do
+  git 'git@github.com:example/myapp.git' do
+    deploy_key chef_vault_item('deploy_keys', 'myapp')['key']
+  end
+end
+```
+
+## Requirements
+
+Chef 12 or newer is required.
+
+## Resources
+
+### `application_git`
+
+The `application_git` resource deploys code from git. It extends the core `git`
+resource to support deploy keys and disabling strict host key verification.
+
+```ruby
+application '/srv/myapp' do
+  git 'git@github.com:example/myapp.git'
+end
+```
+
+#### Actions
+
+All actions work the same as the core `git` resource.
+
+* `:sync` – Clone and checkout the requested revision *(default)*
+* `:checkout` – Checkout the request revision. If the repository isn't already
+  cloned, this action does nothing.
+* `:export` – Export the repository without the `.git` folder.
+
+#### Properties
+
+All properties from the core `git` resource work the same way with the following
+additions:
+
+* `deploy_key` – SSH key to use with git. Can be specified either as a path to
+  key file already created or as a string value containing the key directly.
+* `strict_ssh` – Enable strict SSH host key checking. *(default: false)*
+
+### DSL Usage
+
+The `application_git` resource can be used directly as a replacement for the
+core `git` resource:
+
+```ruby
+application_git '/srv/myapp' do
+  repository 'git@github.com:example/myapp.git'
+  deploy_key chef_vault_item('deploy_keys', 'myapp')['key']
+end
+```
+
+Within the `application` resource, a simplified DSL is available. As with other
+`application` plugins, the default name of the resource if unspecified is the
+application path. The following two examples are equivalent:
+
+```ruby
+application '/srv/myapp' do
+  git do
+    repository 'git@github.com:example/myapp.git'
+  end
+end
+
+application '/srv/myapp' do
+  git 'git@github.com:example/myapp.git'
+end
+```
+
+## Sponsors
+
+Development sponsored by [Chef Software](https://www.chef.io/), [Symonds & Son](http://symondsandson.com/), and [Orion](https://www.orionlabs.co/).
+
+The Poise test server infrastructure is sponsored by [Rackspace](https://rackspace.com/).
+
+## License
+
+Copyright 2015-2016, Noah Kantrowitz
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/cookbooks/application_git/files/halite_gem/poise-application-git.rb
+++ b/cookbooks/application_git/files/halite_gem/poise-application-git.rb
@@ -0,0 +1,17 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application_git'
--- a/cookbooks/application_git/files/halite_gem/poise_application_git.rb
+++ b/cookbooks/application_git/files/halite_gem/poise_application_git.rb
@@ -1,13 +1,11 @@
-
 #
-# Cookbook:: selinux
-# Recipe:: enforcing
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +14,8 @@
 # limitations under the License.
 #

-selinux_install 'selinux'
+require 'poise_application_git/resource'

-selinux_state 'enforcing' do
-  automatic_reboot true
-  action :enforcing
+
+module PoiseApplicationGit
 end
--- a/cookbooks/application_git/files/halite_gem/poise_application_git/cheftie.rb
+++ b/cookbooks/application_git/files/halite_gem/poise_application_git/cheftie.rb
@@ -0,0 +1,17 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application_git/resource'
--- a/cookbooks/application_git/files/halite_gem/poise_application_git/resource.rb
+++ b/cookbooks/application_git/files/halite_gem/poise_application_git/resource.rb
@@ -0,0 +1,204 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'zlib'
+
+require 'chef/provider'
+require 'chef/resource'
+require 'poise_application/app_mixin'
+require 'poise_application/resources/application'
+
+require 'poise_application_git/safe_string'
+
+
+module PoiseApplicationGit
+  # An `application_git` resource to clone application code from git.
+  #
+  # @since 1.0.0
+  # @provides application_git
+  # @action sync
+  # @action checkout
+  # @action export
+  # @example
+  #   application '/srv/myapp' do
+  #     git 'git@github.com:example/myapp.git' do
+  #       deploy_key data_bag_item('deploy_keys', 'myapp')['key']
+  #     end
+  #   end
+  class Resource < Chef::Resource::Git
+    include PoiseApplication::AppMixin
+    provides(:application_git)
+
+    # @api private
+    def initialize(*args)
+      super
+      # Because the superclass declares this, we have to as well. Should be
+      # removable at some point when Chef makes everything use the provider
+      # resolver system instead.
+      @resource_name = :application_git
+      @provider = PoiseApplicationGit::Provider
+      # Clear defaults in older versions of Chef.
+      remove_instance_variable(:@group) if instance_variable_defined?(:@group)
+      remove_instance_variable(:@user) if instance_variable_defined?(:@user)
+    end
+
+    # @!attribute group
+    #   Group to run git as. Defaults to the application group.
+    #   @return [String, Integer, nil, false]
+    attribute(:group, kind_of: [String, Integer, NilClass, FalseClass], default: lazy { parent && parent.group })
+    # @!attribute strict_ssh
+    #   Enable strict SSH host key checking. Defaults to false.
+    #   @return [Boolean]
+    attribute(:strict_ssh, equal_to: [true, false], default: false)
+    # @!attribute user
+    #   User to run git as. Defaults to the application owner.
+    #   @return [String, Integer, nil, false]
+    attribute(:user, kind_of: [String, Integer, NilClass, FalseClass], default: lazy { parent && parent.owner })
+
+    # @api private
+    def after_created
+      # Allow using the repository as the name in an application block.
+      if parent && !repository
+        destination(parent.path)
+        repository(name)
+      end
+    end
+
+    # @!attribute deploy_key
+    #   SSH deploy key as either a string value or a path to a key file.
+    #   @return [String]
+    def deploy_key(val=nil)
+      # Use a SafeString for literal deploy keys so they aren't shown.
+      val = SafeString.new(val) if val && !deploy_key_is_local?(val)
+      set_or_return(:deploy_key, val, kind_of: String)
+    end
+
+    # Default SSH wrapper path.
+    #
+    # @api private
+    # @return [String]
+    def ssh_wrapper_path
+      @ssh_wrapper_path ||= ::File.expand_path("~#{user}/.ssh/ssh_wrapper_#{Zlib.crc32(name)}")
+    end
+
+    # Guess if the deploy key is a local path or literal value.
+    #
+    # @api private
+    # @param key [String, nil] Key value to check. Defaults to self.key.
+    # @return [Boolean]
+    def deploy_key_is_local?(key=nil)
+      key ||= deploy_key
+      key && key[0] == '/'
+    end
+
+    # Path to deploy key.
+    #
+    # @api private
+    # @return [String]
+    def deploy_key_path
+      @deploy_key_path ||= if deploy_key_is_local?
+        deploy_key
+      else
+        ::File.expand_path("~#{user}/.ssh/id_deploy_#{Zlib.crc32(name)}")
+      end
+    end
+  end
+
+  # Provider for `application_git`.
+  #
+  # @since 1.0.0
+  # @see Resource
+  # @provides application_git
+  class Provider < Chef::Provider::Git
+    include PoiseApplication::AppMixin
+    provides(:application_git)
+
+    # @api private
+    def initialize(*args)
+      super
+      # Set the SSH wrapper path in a late-binding kind of way. This better
+      # supports situations where the user doesn't exist until Chef converges.
+      new_resource.ssh_wrapper(new_resource.ssh_wrapper_path) if new_resource.deploy_key
+    end
+
+    # @api private
+    def whyrun_supported?
+      false # Just not dealing with this right now
+    end
+
+    # Hack our special login in before load_current_resource runs because that
+    # needs access to the git remote.
+    #
+    # @api private
+    def load_current_resource
+      include_recipe('git')
+      notifying_block do
+        create_dotssh
+        write_deploy_key
+        write_ssh_wrapper
+      end if new_resource.deploy_key
+      super
+    end
+
+    private
+
+    # Create a .ssh folder for the user.
+    #
+    # @return [void]
+    def create_dotssh
+      directory ::File.expand_path("~#{new_resource.user}/.ssh") do
+        owner new_resource.user
+        group new_resource.group
+        mode '755'
+      end
+    end
+
+    # Copy the deploy key to a file if needed.
+    #
+    # @return [void]
+    def write_deploy_key
+      # Check if we have a local path or some actual content
+      return if new_resource.deploy_key_is_local?
+      file new_resource.deploy_key_path do
+        owner new_resource.user
+        group new_resource.group
+        mode '600'
+        content new_resource.deploy_key
+        sensitive true
+      end
+    end
+
+    # Create the SSH wrapper script.
+    #
+    # @return [void]
+    def write_ssh_wrapper
+      # Write out the GIT_SSH script, it should already be enabled above
+      file new_resource.ssh_wrapper_path do
+        owner new_resource.user
+        group new_resource.group
+        mode '700'
+        content %Q{#!/bin/sh\n/usr/bin/env ssh #{'-o "StrictHostKeyChecking=no" ' unless new_resource.strict_ssh}-i "#{new_resource.deploy_key_path}" $@\n}
+      end
+    end
+
+    # Patch back in the `#git` from the git provider. This otherwise conflicts
+    # with the `#git` defined by the DSL, which gets included in such a way
+    # that the DSL takes priority.
+    def git(*args, &block)
+      Chef::Provider::Git.instance_method(:git).bind(self).call(*args, &block)
+    end
+  end
+end
--- a/cookbooks/application_git/files/halite_gem/poise_application_git/safe_string.rb
+++ b/cookbooks/application_git/files/halite_gem/poise_application_git/safe_string.rb
@@ -0,0 +1,25 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+module PoiseApplicationGit
+  # A string that won't be shown in Chef error output
+  class SafeString < String
+    def to_text
+      '"suppressed sensitive value"'
+    end
+  end
+end
--- a/cookbooks/application_git/files/halite_gem/poise_application_git/version.rb
+++ b/cookbooks/application_git/files/halite_gem/poise_application_git/version.rb
@@ -0,0 +1,20 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+module PoiseApplicationGit
+  VERSION = '1.1.0'
+end
--- a/cookbooks/application_git/libraries/default.rb
+++ b/cookbooks/application_git/libraries/default.rb
@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)
+require "poise_application_git/cheftie"
--- a/cookbooks/application_git/metadata.json
+++ b/cookbooks/application_git/metadata.json
@@ -0,0 +1 @@
+{"name":"application_git","version":"1.1.0","description":"A plugin for poise-application to deploy applications from git.","long_description":"# Application_Git Cookbook\n\n[![Build Status](https://img.shields.io/travis/poise/application_git.svg)](https://travis-ci.org/poise/application_git)\n[![Gem Version](https://img.shields.io/gem/v/poise-application-git.svg)](https://rubygems.org/gems/poise-application-git)\n[![Cookbook Version](https://img.shields.io/cookbook/v/application_git.svg)](https://supermarket.chef.io/cookbooks/application_git)\n[![Coverage](https://img.shields.io/codecov/c/github/poise/application_git.svg)](https://codecov.io/github/poise/application_git)\n[![Gemnasium](https://img.shields.io/gemnasium/poise/application_git.svg)](https://gemnasium.com/poise/application_git)\n[![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)\n\nA [Chef](https://www.chef.io/) cookbook to handle deploying code from git when\nusing the [application cookbook](https://github.com/poise/application).\n\n## Quick Start\n\nTo deploy from a private GitHub repository:\n\n```ruby\napplication '/srv/myapp' do\n  git 'git@github.com:example/myapp.git' do\n    deploy_key chef_vault_item('deploy_keys', 'myapp')['key']\n  end\nend\n```\n\n## Requirements\n\nChef 12 or newer is required.\n\n## Resources\n\n### `application_git`\n\nThe `application_git` resource deploys code from git. It extends the core `git`\nresource to support deploy keys and disabling strict host key verification.\n\n```ruby\napplication '/srv/myapp' do\n  git 'git@github.com:example/myapp.git'\nend\n```\n\n#### Actions\n\nAll actions work the same as the core `git` resource.\n\n* `:sync` – Clone and checkout the requested revision *(default)*\n* `:checkout` – Checkout the request revision. If the repository isn't already\n  cloned, this action does nothing.\n* `:export` – Export the repository without the `.git` folder.\n\n#### Properties\n\nAll properties from the core `git` resource work the same way with the following\nadditions:\n\n* `deploy_key` – SSH key to use with git. Can be specified either as a path to\n  key file already created or as a string value containing the key directly.\n* `strict_ssh` – Enable strict SSH host key checking. *(default: false)*\n\n### DSL Usage\n\nThe `application_git` resource can be used directly as a replacement for the\ncore `git` resource:\n\n```ruby\napplication_git '/srv/myapp' do\n  repository 'git@github.com:example/myapp.git'\n  deploy_key chef_vault_item('deploy_keys', 'myapp')['key']\nend\n```\n\nWithin the `application` resource, a simplified DSL is available. As with other\n`application` plugins, the default name of the resource if unspecified is the\napplication path. The following two examples are equivalent:\n\n```ruby\napplication '/srv/myapp' do\n  git do\n    repository 'git@github.com:example/myapp.git'\n  end\nend\n\napplication '/srv/myapp' do\n  git 'git@github.com:example/myapp.git'\nend\n```\n\n## Sponsors\n\nDevelopment sponsored by [Chef Software](https://www.chef.io/), [Symonds & Son](http://symondsandson.com/), and [Orion](https://www.orionlabs.co/).\n\nThe Poise test server infrastructure is sponsored by [Rackspace](https://rackspace.com/).\n\n## License\n\nCopyright 2015-2016, Noah Kantrowitz\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n","maintainer":"Noah Kantrowitz","maintainer_email":"noah@coderanger.net","license":"Apache 2.0","platforms":{},"dependencies":{"git":">= 0.0.0","poise":"~> 2.0","application":"~> 5.0"},"recommendations":{},"suggestions":{},"conflicting":{},"providing":{},"replacing":{},"attributes":{},"groupings":{},"recipes":{}}
--- a/cookbooks/application_javascript/CHANGELOG.md
+++ b/cookbooks/application_javascript/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Application_Javascript Changelog
+
+## v1.0.0
+
+Initial release!
--- a/cookbooks/application_javascript/README.md
+++ b/cookbooks/application_javascript/README.md
@@ -0,0 +1,132 @@
+# Application_Javascript Cookbook
+
+[![Build Status](https://img.shields.io/travis/poise/application_javascript.svg)](https://travis-ci.org/poise/application_javascript)
+[![Gem Version](https://img.shields.io/gem/v/poise-application-javascript.svg)](https://rubygems.org/gems/poise-application-javascript)
+[![Cookbook Version](https://img.shields.io/cookbook/v/application_javascript.svg)](https://supermarket.chef.io/cookbooks/application_javascript)
+[![Coverage](https://img.shields.io/codecov/c/github/poise/application_javascript.svg)](https://codecov.io/github/poise/application_javascript)
+[![Gemnasium](https://img.shields.io/gemnasium/poise/application_javascript.svg)](https://gemnasium.com/poise/application_javascript)
+[![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+
+A [Chef](https://www.chef.io/) cookbook to deploy server-side JavaScript
+applications using Node.js or io.js.
+
+## Quick Start
+
+To deploy an Express application from git:
+
+```ruby
+application '/srv/myapp' do
+  git 'https://github.com/example/myapp.git'
+  npm_install
+  npm_start
+end
+```
+
+## Requirements
+
+Chef 12 or newer is required.
+
+## Resources
+
+### `application_javascript`
+
+The `application_javascript` resource installs a JavaScript runtime for the
+deployment.
+
+```ruby
+application '/srv/myapp' do
+  javascript '3'
+end
+```
+
+All actions and properties are the same as the [`javascript_runtime` resource](https://github.com/poise/poise-javascript#javascript_runtime).
+
+### `application_javascript_service`
+
+The `application_javascript_javascript_service` resource creates a service for a
+JavaScript command.
+
+```ruby
+application '/srv/myapp' do
+  javascript_service 'main.js'
+end
+```
+
+#### Actions
+
+* `:enable` – Create, enable and start the service. *(default)*
+* `:disable` – Stop, disable, and destroy the service.
+* `:start` – Start the service.
+* `:stop` – Stop the service.
+* `:restart` – Stop and then start the service.
+* `:reload` – Send the configured reload signal to the service.
+
+#### Properties
+
+* `command` – Command to run. *(name attribute)*
+* `path` – Base path for the application. *(default: application path)*
+* `service_name` – Name of the service to create. *(default: auto-detect)*
+# `user` – User to run the service as. *(default: application owner)*
+
+### `application_node_package`
+
+The `application_node_package` resource installs NPM packages for the deployment.
+
+```ruby
+application '/srv/myapp' do
+  node_package 'grunt-cli'
+end
+```
+
+All actions and properties are the same as the [`node_package` resource](https://github.com/poise/poise-javascript#node_package),
+except that the `group` and `user` properties default to the application-level
+data if not specified.
+
+### `application_npm_start`
+
+The `application_npm_start` resource creates a service for a JavaScript
+application using `npm start`.
+
+```ruby
+application '/srv/myapp' do
+  npm_start
+end
+```
+
+#### Actions
+
+* `:enable` – Create, enable and start the service. *(default)*
+* `:disable` – Stop, disable, and destroy the service.
+* `:start` – Start the service.
+* `:stop` – Stop the service.
+* `:restart` – Stop and then start the service.
+* `:reload` – Send the configured reload signal to the service.
+
+#### Properties
+
+* `path` – Base path for the application. *(default: name attribute)*
+* `command` – NPM subcommand to run. *(default: start)*
+* `service_name` – Name of the service to create. *(default: auto-detect)*
+# `user` – User to run the service as. *(default: application owner)*
+
+## Sponsors
+
+Development sponsored by [Chef Software](https://www.chef.io/), [Symonds & Son](http://symondsandson.com/), and [Orion](https://www.orionlabs.co/).
+
+The Poise test server infrastructure is sponsored by [Rackspace](https://rackspace.com/).
+
+## License
+
+Copyright 2015, Noah Kantrowitz
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript.rb
@@ -0,0 +1,23 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+module PoiseApplicationJavascript
+  autoload :AppMixin, 'poise_application_javascript/app_mixin'
+  autoload :Error, 'poise_application_javascript/error'
+  autoload :Resources, 'poise_application_javascript/resources'
+  autoload :VERSION, 'poise_application_javascript/version'
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/app_mixin.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/app_mixin.rb
@@ -0,0 +1,67 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise/backports'
+require 'poise/utils'
+require 'poise_application/app_mixin'
+require 'poise_javascript/javascript_command_mixin'
+
+
+module PoiseApplicationJavascript
+  # A helper mixin for Javascript application resources and providers.
+  #
+  # @since 4.0.0
+  module AppMixin
+    include Poise::Utils::ResourceProviderMixin
+
+    # A helper mixin for Javascript application resources.
+    module Resource
+      include PoiseApplication::AppMixin::Resource
+      include PoiseJavascript::JavascriptCommandMixin::Resource
+
+      # @!attribute parent_javascript
+      #   Override the #parent_javascript from JavascriptCommandMixin to grok the
+      #   application level parent as a default value.
+      #   @return [PoiseJavascript::Resources::JavascriptRuntime::Resource, nil]
+      parent_attribute(:javascript, type: :javascript_runtime, optional: true, default: lazy { app_state_javascript.equal?(self) ? nil : app_state_javascript })
+
+      # @attribute app_state_javascript
+      #   The application-level Javascript parent.
+      #   @return [PoiseJavascript::Resources::JavascriptRuntime::Resource, nil]
+      def app_state_javascript(javascript=Poise::NOT_PASSED)
+        unless javascript == Poise::NOT_PASSED
+          app_state[:javascript] = javascript
+        end
+        app_state[:javascript]
+      end
+
+      # A merged hash of environment variables for both the application state
+      # and parent javascript.
+      #
+      # @return [Hash<String, String>]
+      def app_state_environment_javascript
+        env = app_state_environment
+        env = env.merge(parent_javascript.javascript_environment) if parent_javascript
+        env
+      end
+    end
+
+    # A helper mixin for Javascript application providers.
+    module Provider
+      include PoiseApplication::AppMixin::Provider
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/cheftie.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/cheftie.rb
@@ -0,0 +1,17 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application_javascript/resources'
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/error.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/error.rb
@@ -0,0 +1,25 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application/error'
+
+module PoiseApplicationJavascript
+  # Base exception class for poise-application-javascript errors.
+  #
+  # @since 1.0.0
+  class Error < PoiseApplication::Error
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources.rb
@@ -0,0 +1,22 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_application_javascript/resources/javascript'
+require 'poise_application_javascript/resources/javascript_execute'
+require 'poise_application_javascript/resources/javascript_service'
+require 'poise_application_javascript/resources/node_package'
+require 'poise_application_javascript/resources/npm_install'
+require 'poise_application_javascript/resources/npm_start'
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript.rb
@@ -0,0 +1,64 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_javascript/resources/javascript_runtime'
+
+require 'poise_application_javascript/app_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see Javascript::Resource)
+    # @since 1.0.0
+    module Javascript
+      # An `application_javascript` resource to manage Javascript runtimes
+      # inside an Application cookbook deployment.
+      #
+      # @provides application_javascript
+      # @provides application_javascript_runtime
+      # @action install
+      # @action uninstall
+      # @example
+      #   application '/app' do
+      #     javascript '3'
+      #   end
+      class Resource < PoiseJavascript::Resources::JavascriptRuntime::Resource
+        include PoiseApplicationJavascript::AppMixin
+        provides(:application_javascript)
+        # Need the double javascript for application resource rewriting.
+        provides(:application_javascript_runtime)
+        container_default(false)
+        subclass_providers!
+
+        # We want to run the base class version of this, not the one from the
+        # mixin. HULK SMASH.
+        def npm_binary
+          self.class.superclass.instance_method(:npm_binary).bind(self).call
+        end
+
+        # Set this resource as the app_state's parent javascript.
+        #
+        # @api private
+        def after_created
+          super.tap do |val|
+            app_state_javascript(self)
+          end
+        end
+
+      end
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript_execute.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript_execute.rb
@@ -0,0 +1,88 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_javascript/resources/javascript_execute'
+
+require 'poise_application_javascript/app_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see JavascriptExecute::Resource)
+    # @since 1.0.0
+    module JavascriptExecute
+      # An `application_javascript_execute` resource to run Javascript commands inside an
+      # Application cookbook deployment.
+      #
+      # @provides application_javascript_execute
+      # @action run
+      # @example
+      #   application '/srv/myapp' do
+      #     javascript_execute 'setup.py install'
+      #   end
+      class Resource < PoiseJavascript::Resources::JavascriptExecute::Resource
+        include PoiseApplicationJavascript::AppMixin
+        provides(:application_javascript_execute)
+        def initialize(*args)
+          super
+          # Clear some instance variables so my defaults work.
+          remove_instance_variable(:@cwd)
+          remove_instance_variable(:@group)
+          remove_instance_variable(:@user)
+        end
+
+        # #!attribute cwd
+        #   Override the default directory to be the app path if unspecified.
+        #   @return [String]
+        attribute(:cwd, kind_of: [String, NilClass, FalseClass], default: lazy { parent && parent.path })
+
+        # #!attribute group
+        #   Override the default group to be the app group if unspecified.
+        #   @return [String, Integer]
+        attribute(:group, kind_of: [String, Integer, NilClass, FalseClass], default: lazy { parent && parent.group })
+
+        # #!attribute user
+        #   Override the default user to be the app owner if unspecified.
+        #   @return [String, Integer]
+        attribute(:user, kind_of: [String, Integer, NilClass, FalseClass], default: lazy { parent && parent.owner })
+      end
+
+      # The default provider for `application_javascript_execute`.
+      #
+      # @see Resource
+      # @provides application_javascript_execute
+      class Provider < PoiseJavascript::Resources::JavascriptExecute::Provider
+        provides(:application_javascript_execute)
+
+        private
+
+        # Override environment to add the application envivonrment instead.
+        #
+        # @return [Hash]
+        def environment
+          super.tap do |environment|
+            # Don't use the app_state_environment_javascript because we already have
+            # those values in place.
+            environment.update(new_resource.app_state_environment)
+            # Re-apply the resource environment for correct ordering.
+            environment.update(new_resource.environment) if new_resource.environment
+          end
+        end
+      end
+
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript_service.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/javascript_service.rb
@@ -0,0 +1,59 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/provider'
+require 'chef/resource'
+require 'poise'
+
+require 'poise_application_javascript/service_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see JavascriptService::Resource)
+    # @since 1.0.0
+    module JavascriptService
+      class Resource < Chef::Resource
+        include PoiseApplicationJavascript::ServiceMixin
+        provides(:application_javascript_service)
+
+        # @!attribute command
+        #   Command to run.
+        #   @return [String]
+        attribute(:command, kind_of: String, name_attribute: true)
+        # @!attribute path
+        #   Override {PoiseApplicationJavascript::ServiceMixin#path} to make it
+        #   not the name_attribute.
+        #   @return [String]
+        attribute(:path, kind_of: String, default: lazy { parent && parent.path })
+      end
+
+      class Provider < Chef::Provider
+        include PoiseApplicationJavascript::ServiceMixin
+        provides(:application_javascript_service)
+
+        private
+
+        # (see PoiseApplication::ServiceMixin#service_options)
+        def service_options(resource)
+          super
+          resource.javascript_command(new_resource.command)
+        end
+
+      end
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/node_package.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/node_package.rb
@@ -0,0 +1,63 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_javascript/resources/node_package'
+
+require 'poise_application_javascript/app_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see NodePackage::Resource)
+    # @since 1.0.0
+    module NodePackage
+      # An `application_node_package` resource to install NPM packages inside
+      # an Application cookbook deployment.
+      #
+      # @provides application_node_package
+      # @action install
+      # @action upgrade
+      # @action remove
+      # @example
+      #   application '/app' do
+      #     node_package %w{grunt-cli gulp}
+      #   end
+      class Resource < PoiseJavascript::Resources::NodePackage::Resource
+        include PoiseApplicationJavascript::AppMixin
+        provides(:application_node_package)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_node_package
+        end
+
+        # #!attribute group
+        #   Override the default group to be the app group if unspecified.
+        #   @return [String, Integer]
+        attribute(:group, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.group })
+
+        # #!attribute user
+        #   Override the default user to be the app owner if unspecified.
+        #   @return [String, Integer]
+        attribute(:user, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.owner })
+
+        # @todo This should handle relative paths against parent.path.
+      end
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/npm_install.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/npm_install.rb
@@ -0,0 +1,45 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_javascript/resources/npm_install'
+
+require 'poise_application_javascript/app_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see NpmInstall::Resource)
+    # @since 1.0.0
+    module NpmInstall
+      # An `application_npm_install` resource to install package
+      # dependencies inside an Application cookbook deployment.
+      #
+      # @provides application_npm_install
+      # @action install
+      # @example
+      #   application '/app' do
+      #     npm_install
+      #   end
+      class Resource < PoiseJavascript::Resources::NpmInstall::Resource
+        include PoiseApplicationJavascript::AppMixin
+        provides(:application_npm_install)
+        subclass_providers!
+
+        # @todo This should handle relative paths against parent.path.
+      end
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/npm_start.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/resources/npm_start.rb
@@ -0,0 +1,78 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'shellwords'
+
+require 'chef/provider'
+require 'chef/resource'
+require 'poise'
+
+require 'poise_application_javascript/service_mixin'
+
+
+module PoiseApplicationJavascript
+  module Resources
+    # (see NpmStart::Resource)
+    # @since 1.0.0
+    module NpmStart
+      # An `application_npm_start` resource to create a service for a Javascript
+      # application using `npm start`.
+      #
+      # @provides application_npm_start
+      # @action enable
+      # @action disable
+      # @action start
+      # @action stop
+      # @action restart
+      # @action reload
+      # @example
+      #   application '/app' do
+      #     npm_start
+      #   end
+      class Resource < Chef::Resource
+        include PoiseApplicationJavascript::ServiceMixin
+        provides(:application_npm_start)
+
+        # @!attribute command
+        #   NPM sub-command to run. Defaults to `start`.
+        #   @return [String, Array<String>]
+        attribute(:command, kind_of: [String, Array], default: 'start')
+      end
+
+      # The default provider for `application_npm_start`.
+      #
+      # @see Resource
+      # @provides application_npm_start
+      class Provider < Chef::Provider
+        include PoiseApplicationJavascript::ServiceMixin
+        provides(:application_npm_start)
+
+        private
+
+        # (see PoiseApplication::ServiceMixin#service_options)
+        def service_options(resource)
+          super
+          npm_cmd = [new_resource.npm_binary] + Array(new_resource.command)
+          resource.javascript_command(Shellwords.join(npm_cmd))
+          # Make sure node is on $PATH because grrr.
+          new_path = [::File.dirname(new_resource.javascript), (new_resource.app_state_environment_javascript['PATH'] || ENV['PATH']).to_s].join(::File::PATH_SEPARATOR)
+          resource.environment['PATH'] = new_path
+        end
+
+      end
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/service_mixin.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/service_mixin.rb
@@ -0,0 +1,57 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise/utils'
+require 'poise_application/service_mixin'
+require 'poise_languages/utils'
+
+require 'poise_application_javascript/app_mixin'
+
+
+module PoiseApplicationJavascript
+  # A helper mixin for Javascript service resources and providers.
+  #
+  # @since 1.0.0
+  module ServiceMixin
+    include Poise::Utils::ResourceProviderMixin
+
+    # A helper mixin for Javascript service resources.
+    module Resource
+      include PoiseApplication::ServiceMixin::Resource
+      include PoiseApplicationJavascript::AppMixin::Resource
+    end
+
+    # A helper mixin for Javascript service providers.
+    module Provider
+      include PoiseApplication::ServiceMixin::Provider
+      include PoiseApplicationJavascript::AppMixin::Provider
+
+      # Set up the service for running Javascript stuff.
+      def service_options(resource)
+        super
+        # Closure scoping for #javascript_command below.
+        self_ = self
+        # Create a new singleton method that fills in `node` for you.
+        resource.define_singleton_method(:javascript_command) do |val|
+          resource.command("#{self_.new_resource.javascript} #{PoiseLanguages::Utils.absolute_command(val, path: self_.new_resource.app_state_environment_javascript['PATH'])}")
+        end
+        # Include env vars as needed.
+        resource.environment.update(new_resource.parent_javascript.javascript_environment) if new_resource.parent_javascript
+      end
+
+    end
+  end
+end
--- a/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/version.rb
+++ b/cookbooks/application_javascript/files/halite_gem/poise_application_javascript/version.rb
@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module PoiseApplicationJavascript
+  VERSION = '1.0.0'
+end
--- a/cookbooks/application_javascript/libraries/default.rb
+++ b/cookbooks/application_javascript/libraries/default.rb
@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)
+require "poise_application_javascript/cheftie"
--- a/cookbooks/application_javascript/metadata.json
+++ b/cookbooks/application_javascript/metadata.json
--- a/cookbooks/ark/CHANGELOG.md
+++ b/cookbooks/ark/CHANGELOG.md
@@ -2,40 +2,6 @@

 This file is used to list changes made in each version of the ark cookbook.

-## 6.0.3 - *2021-08-30*
-
- Standardise files with files in sous-chefs/repo-management
-
-## 6.0.2 - *2021-06-18*
-
- Update location of test archive fixtures
-
-## 6.0.1 - *2021-06-01*
-
- Standardise files with files in sous-chefs/repo-management
-
-## 6.0.0 - *2021-05-22*
-
- Chef 17 updates: enable `unified_mode` on all resources
- Bump required Chef Infra Client to >= 15.3
- Migrate to using `seven_zip_tool` resource directly and require `seven_zip` >= 3.1
- Various ChefSpec fixes
-
-## 5.1.1 - *2021-04-29*
-
- Added a version pin on seven_zip
-
-## 5.1.0 - *2021-01-24*
-
- Sous Chefs Adoption
- Standardise files with files in sous-chefs/repo-management
- Cookstyle fixes
- Add integration testing for Windows and MacOS
- Remove testing for Amazon Linux 201x, CentOS 6 and Ubuntu 16.04
- Fix ChefSpec tests
- Fix issues with `--strip-components` with the `:cherry_pick` action on MacOS
- Ensure `/etc/profile.d` exists on MacOS if `append_env_path` is used
-
 ## 5.0.0 (2020-01-02)

 - Require Chef Infra Client 14+ and remove the need for the build_essential dependency - [@tas50](https://github.com/tas50)
@@ -67,9 +33,8 @@ This file is used to list changes made in each version of the ark cookbook.
 - Rewrite of resource to custom resources.
 - Remove EOL platforms from testing.
 - Update zlib URL
-
+-
 ## 2.2.1 (2016-12-16)
-
 - Use Ohai root_group attribute to avoid trying to set the group to root on BSD/macOS.
 - Add missing accessor for owner property

--- a/cookbooks/ark/CONTRIBUTING.md
+++ b/cookbooks/ark/CONTRIBUTING.md
@@ -0,0 +1,2 @@
+Please refer to
+https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD
--- a/cookbooks/ark/LICENSE
+++ b/cookbooks/ark/LICENSE
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--- a/cookbooks/ark/README.md
+++ b/cookbooks/ark/README.md
@@ -1,10 +1,6 @@
 # ark cookbook

-[![Cookbook Version](https://img.shields.io/cookbook/v/ark.svg)](https://supermarket.chef.io/cookbooks/ark)
-[![CI State](https://github.com/sous-chefs/ark/workflows/ci/badge.svg)](https://github.com/sous-chefs/ark/actions?query=workflow%3Aci)
-[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers)
-[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
-[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Build Status](https://travis-ci.org/chef-cookbooks/ark.svg?branch=master)](https://travis-ci.org/chef-cookbooks/ark) [![Cookbook Version](https://img.shields.io/cookbook/v/ark.svg)](https://supermarket.chef.io/cookbooks/ark)

 ## Overview

@@ -31,10 +27,6 @@ By default, the ark will not run again if the `:path` is not empty. Ark provides

 For remote files ark supports URLs using the [remote_file](http://docs.chef.io/resource_remote_file.html) resource. Local files are accessed with the `file://` syntax.

-## Maintainers
-
-This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of Chef cookbook maintainers working together to maintain important cookbooks. If you’d like to know more please visit [sous-chefs.org](https://sous-chefs.org/) or come chat with us on the Chef Community Slack in [#sous-chefs](https://chefcommunity.slack.com/messages/C2V7B88SF).
-
 ## Requirements

 ### Platforms
@@ -277,27 +269,29 @@ You can also supply the file extension in case the file extension can not be det
 end
 ```

-## Contributors
+## License & Authors

-This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false)
+- Author: Philip (flip) Kromer - Infochimps, Inc([coders@infochimps.com](mailto:coders@infochimps.com))
+- Author: Bryan W. Berry ([bryan.berry@gmail.com](mailto:bryan.berry@gmail.com))
+- Author: Denis Barishev ([denis.barishev@gmail.com](mailto:denis.barishev@gmail.com))
+- Author: Sean OMeara ([someara@chef.io](mailto:someara@chef.io))
+- Author: John Bellone ([jbellone@bloomberg.net](mailto:jbellone@bloomberg.net))
+- Copyright: 2011, Philip (flip) Kromer - Infochimps, Inc
+- Copyright: 2012, Bryan W. Berry
+- Copyright: 2012, Denis Barishev
+- Copyright: 2013-2017, Chef Software, Inc
+- Copyright: 2014, Bloomberg L.P.

-### Backers
+```
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at

-Thank you to all our backers!
+    http://www.apache.org/licenses/LICENSE-2.0

-![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40)
-
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
-
-![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100)
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
--- a/cookbooks/ark/attributes/default.rb
+++ b/cookbooks/ark/attributes/default.rb
@@ -31,7 +31,7 @@ pkgs = %w(libtool autoconf) unless platform_family?('mac_os_x')
 pkgs += %w(make) unless platform_family?('mac_os_x', 'freebsd')
 pkgs += %w(unzip rsync gcc) unless platform_family?('mac_os_x')
 pkgs += %w(autogen) unless platform_family?('rhel', 'fedora', 'mac_os_x', 'suse', 'amazon')
-pkgs += %w(gtar) if platform?('freebsd', 'smartos')
+pkgs += %w(gtar) if platform?('freebsd') || platform?('smartos')
 pkgs += %w(gmake) if platform?('freebsd')
 if platform_family?('rhel', 'suse', 'amazon')
  if node['platform_version'].to_i >= 7
--- a/cookbooks/ark/chefignore
+++ b/cookbooks/ark/chefignore
@@ -1,115 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# to a Chef Infra Server or Supermarket.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-ehthumbs.db
-Icon?
-nohup.out
-Thumbs.db
-.envrc
-
-# EDITORS #
-###########
-.#*
-.project
-.settings
-*_flymake
-*_flymake.*
-*.bak
-*.sw[a-z]
-*.tmproj
-*~
-\#*
-REVISION
-TAGS*
-tmtags
-.vscode
-.editorconfig
-
-## COMPILED ##
-##############
-*.class
-*.com
-*.dll
-*.exe
-*.o
-*.pyc
-*.so
-*/rdoc/
-a.out
-mkmf.log
-
-# Testing #
-###########
-.circleci/*
-.codeclimate.yml
-.delivery/*
-.foodcritic
-.kitchen*
-.mdlrc
-.overcommit.yml
-.rspec
-.rubocop.yml
-.travis.yml
-.watchr
-.yamllint
-azure-pipelines.yml
-Dangerfile
-examples/*
-features/*
-Guardfile
-kitchen.yml*
-mlc_config.json
-Procfile
-Rakefile
-spec/*
-test/*
-
-# SCM #
-#######
-.git
-.gitattributes
-.gitconfig
-.github/*
-.gitignore
-.gitkeep
-.gitmodules
-.svn
-*/.bzr/*
-*/.git
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Bundler #
-###########
-vendor/*
-Gemfile
-Gemfile.lock
-
-# Policyfile #
-##############
-Policyfile.rb
-Policyfile.lock.json
-
-# Documentation #
-#############
-CODE_OF_CONDUCT*
-CONTRIBUTING*
-documentation/*
-TESTING*
-UPGRADING*
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
--- a/cookbooks/ark/kitchen.dokken.yml
+++ b/cookbooks/ark/kitchen.dokken.yml
@@ -1,65 +0,0 @@
-driver:
-  name: dokken
-  privileged: true  # because Docker and SystemD
-  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-  chef_license: accept-no-persist
-
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
-
-platforms:
-  - name: amazonlinux-2
-    driver:
-      image: dokken/amazonlinux-2
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: debian-9
-    driver:
-      image: dokken/debian-9
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: debian-10
-    driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: centos-7
-    driver:
-      image: dokken/centos-7
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: centos-8
-    driver:
-      image: dokken/centos-8
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: fedora-latest
-    driver:
-      image: dokken/fedora-latest
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: ubuntu-20.04
-    driver:
-      image: dokken/ubuntu-20.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: opensuse-leap-15
-    driver:
-      image: dokken/opensuse-leap-15
-      pid_one_command: /bin/systemd
--- a/cookbooks/ark/kitchen.exec.yml
+++ b/cookbooks/ark/kitchen.exec.yml
@@ -1,14 +0,0 @@
---
-driver:
-  name: exec
-
-transport:
-  name: exec
-
-provisioner:
-  name: chef_zero
-  deprecations_as_errors: true
-
-platforms:
-  - name: windows-latest
-  - name: macos-latest
--- a/cookbooks/ark/libraries/resource_defaults.rb
+++ b/cookbooks/ark/libraries/resource_defaults.rb
@@ -104,7 +104,7 @@ module Ark
    def wmi_property_from_query(wmi_property, wmi_query)
      @wmi = ::WIN32OLE.connect('winmgmts://')
      result = @wmi.ExecQuery(wmi_query)
-      return unless result.each.count > 0
+      return nil unless result.each.count > 0
      result.each.next.send(wmi_property)
    end

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				{"name":"application_git","version":"1.1.0","description":"A plugin for poise-application to deploy applications from git.","long_description":"# Application_Git Cookbook\n\n[![Build Status](https://img.shields.io/travis/poise/application_git.svg)](https://travis-ci.org/poise/application_git)\n[![Gem Version](https://img.shields.io/gem/v/poise-application-git.svg)](https://rubygems.org/gems/poise-application-git)\n[![Cookbook Version](https://img.shields.io/cookbook/v/application_git.svg)](https://supermarket.chef.io/cookbooks/application_git)\n[![Coverage](https://img.shields.io/codecov/c/github/poise/application_git.svg)](https://codecov.io/github/poise/application_git)\n[![Gemnasium](https://img.shields.io/gemnasium/poise/application_git.svg)](https://gemnasium.com/poise/application_git)\n[![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)\n\nA [Chef](https://www.chef.io/) cookbook to handle deploying code from git when\nusing the [application cookbook](https://github.com/poise/application).\n\n## Quick Start\n\nTo deploy from a private GitHub repository:\n\n```ruby\napplication '/srv/myapp' do\n git 'git@github.com:example/myapp.git' do\n deploy_key chef_vault_item('deploy_keys', 'myapp')['key']\n end\nend\n```\n\n## Requirements\n\nChef 12 or newer is required.\n\n## Resources\n\n### `application_git`\n\nThe `application_git` resource deploys code from git. It extends the core `git`\nresource to support deploy keys and disabling strict host key verification.\n\n```ruby\napplication '/srv/myapp' do\n git 'git@github.com:example/myapp.git'\nend\n```\n\n#### Actions\n\nAll actions work the same as the core `git` resource.\n\n* `:sync` – Clone and checkout the requested revision (default)\n* `:checkout` – Checkout the request revision. If the repository isn't already\n cloned, this action does nothing.\n* `:export` – Export the repository without the `.git` folder.\n\n#### Properties\n\nAll properties from the core `git` resource work the same way with the following\nadditions:\n\n* `deploy_key` – SSH key to use with git. Can be specified either as a path to\n key file already created or as a string value containing the key directly.\n* `strict_ssh` – Enable strict SSH host key checking. (default: false)\n\n### DSL Usage\n\nThe `application_git` resource can be used directly as a replacement for the\ncore `git` resource:\n\n```ruby\napplication_git '/srv/myapp' do\n repository 'git@github.com:example/myapp.git'\n deploy_key chef_vault_item('deploy_keys', 'myapp')['key']\nend\n```\n\nWithin the `application` resource, a simplified DSL is available. As with other\n`application` plugins, the default name of the resource if unspecified is the\napplication path. The following two examples are equivalent:\n\n```ruby\napplication '/srv/myapp' do\n git do\n repository 'git@github.com:example/myapp.git'\n end\nend\n\napplication '/srv/myapp' do\n git 'git@github.com:example/myapp.git'\nend\n```\n\n## Sponsors\n\nDevelopment sponsored by [Chef Software](https://www.chef.io/), [Symonds & Son](http://symondsandson.com/), and [Orion](https://www.orionlabs.co/).\n\nThe Poise test server infrastructure is sponsored by [Rackspace](https://rackspace.com/).\n\n## License\n\nCopyright 2015-2016, Noah Kantrowitz\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n","maintainer":"Noah Kantrowitz","maintainer_email":"noah@coderanger.net","license":"Apache 2.0","platforms":{},"dependencies":{"git":">= 0.0.0","poise":"~> 2.0","application":"~> 5.0"},"recommendations":{},"suggestions":{},"conflicting":{},"providing":{},"replacing":{},"attributes":{},"groupings":{},"recipes":{}}