diff --git a/scripts/website_push.sh b/scripts/website_push.sh deleted file mode 100755 index 92a32e699..000000000 --- a/scripts/website_push.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Switch to the stable-website branch -git checkout stable-website - -# Set the tmpdir -if [ -z "$TMPDIR" ]; then - TMPDIR="/tmp" -fi - -# Create a temporary build dir and make sure we clean it up. For -# debugging, comment out the trap line. -DEPLOY=`mktemp -d $TMPDIR/vault-www-XXXXXX` -trap "rm -rf $DEPLOY" INT TERM EXIT - -# Get the parent directory of where this script is. -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done -DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" - -# Copy into tmpdir -shopt -s dotglob -cp -r $DIR/website/* $DEPLOY/ - -# Change into that directory -pushd $DEPLOY &>/dev/null - -# Ignore some stuff -touch .gitignore -echo ".sass-cache" >> .gitignore -echo "build" >> .gitignore -echo "vendor" >> .gitignore - -# Add everything -git init -q . -git add . -git commit -q -m "Deploy by $USER" - -git remote add heroku git@heroku.com:vault-www.git -git push -f heroku master - -# Go back to our root -popd &>/dev/null diff --git a/website/.buildpacks b/website/.buildpacks deleted file mode 100644 index f85b304c3..000000000 --- a/website/.buildpacks +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/heroku/heroku-buildpack-ruby.git -https://github.com/hashicorp/heroku-buildpack-middleman.git diff --git a/website/Gemfile b/website/Gemfile index 2b35e2810..7ef6a8f31 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,5 +1,3 @@ source "https://rubygems.org" -ruby "2.2.2" - gem "middleman-hashicorp", github: "hashicorp/middleman-hashicorp" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 64e5f4fd8..d37556ec0 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: 15cbda0cf1d963fa71292dee921229e7ee618272 + revision: 953baf8762b915cf57553bcc82bc946ad777056f specs: middleman-hashicorp (0.2.0) bootstrap-sass (~> 3.3) @@ -21,18 +21,18 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.2.4) + activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (6.0.3) + autoprefixer-rails (6.2.3) execjs json - bootstrap-sass (3.3.5.1) - autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.3.0) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.2) capybara (2.4.4) mime-types (>= 1.16) @@ -40,11 +40,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - chunky_png (1.3.4) + chunky_png (1.3.5) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.10.0) commonjs (0.2.7) compass (1.0.3) chunky_png (~> 1.2) @@ -63,7 +63,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.8) + eventmachine (1.0.9.1) execjs (2.6.0) ffi (1.9.10) git-version-bump (0.15.1) @@ -80,21 +80,21 @@ GEM less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.13) - listen (3.0.3) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.4.0) + middleman (3.4.1) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.4.0) + middleman-core (= 3.4.1) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.4.0) + middleman-core (3.4.1) activesupport (~> 4.1) bundler (~> 1.1) capybara (~> 2.4.4) @@ -106,7 +106,7 @@ GEM rack (>= 1.4.5, < 2.0) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-livereload (3.4.3) + middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) @@ -118,15 +118,17 @@ GEM sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.3.0) - middleman-syntax (2.0.0) - middleman-core (~> 3.2) + middleman-syntax (2.1.0) + middleman-core (>= 3.2) rouge (~> 1.0) - mime-types (2.6.2) - mini_portile (0.6.2) - minitest (5.8.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2015.1120) + mini_portile2 (2.0.0) + minitest (5.8.3) multi_json (1.11.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.5) @@ -145,13 +147,13 @@ GEM rack-ssl-enforcer (0.2.9) rack-test (0.6.3) rack (>= 1.0) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.3) + redcarpet (3.3.4) ref (2.0.0) rouge (1.10.1) - sass (3.4.19) + sass (3.4.21) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -186,3 +188,6 @@ PLATFORMS DEPENDENCIES middleman-hashicorp! + +BUNDLED WITH + 1.10.6 diff --git a/website/Procfile b/website/Procfile deleted file mode 100644 index 58361e473..000000000 --- a/website/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: bundle exec thin start -p $PORT diff --git a/website/config.rb b/website/config.rb index 07af5c0c7..00a3c2c6f 100644 --- a/website/config.rb +++ b/website/config.rb @@ -5,6 +5,4 @@ activate :hashicorp do |h| h.version = "0.4.1" h.github_slug = "hashicorp/vault" h.website_root = "website" - - h.minify_javascript = false end diff --git a/website/version.txt b/website/version.txt deleted file mode 100644 index 3143519fa..000000000 --- a/website/version.txt +++ /dev/null @@ -1,3 +0,0 @@ -Bump this to force website deploy: - -3