i think we are ready

diff --git a/.travis.yml b/.travis.yml
index b12d439c6405e0044eebf74a78655fab2394947c..dc4c3bc9cf615688b8b43de443e038a79ee6528c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,9 @@ before_install:
 - npm install myth
 - npm install svgo
 - openssl aes-256-cbc -K $encrypted_ac880c30010f_key -iv $encrypted_ac880c30010f_iv
-  -in .deploy-key.enc -out .deploy-key -d && chmod go-rwx .deploy-key || true
-after_success: ./deploy.sh
+  -in deploy/key1.enc -out deploy/key1 -d && chmod go-rwx deploy/key1 || true
+- openssl aes-256-cbc -K $encrypted_2bfadd9dc6b8_key -iv $encrypted_2bfadd9dc6b8_iv
+  -in deploy/key2.enc -out deploy/key2 -d && chmod go-rwx deploy/key2 || true
+after_success: ./deploy/deploy.sh
 notifications:
   email: false

diff --git a/content/pages/404.md b/content/pages/404.md
index 34804ac38326a60060fa68a4797c895293e0aada..cb99691b7823b87b176b2b8d09e48eef2a8a16b0 100644 (file)
--- a/content/pages/404.md
+++ b/content/pages/404.md
@@ -1,15 +1,8 @@
-title: 404 - Not found
+title: 404—Not Found
 slug: 404
 ---
-Sorry, the staff ran away with this page.
+You've followed an outdated link (sorry) or otherwise ended up at a page that
+doesn't exist.
 
-Try kindly asking them at [#freenode](irc://chat.freenode.net:6667/freenode) to bring it back.
-
-
-That didn't suit you apparently as you kept reading, but don't worry here's some steps you can take from here:
-  
-  * [Go to the start page](index)
-  
-  * [Learn how to connect to freenode](kb/connect/chat)
-  
-  * [Use internet protection](https://www.privateinternetaccess.com/pages/buy-vpn/freend/)
\ No newline at end of file
+Try starting from [the home page](index) or exploring the navigation links
+below.

diff --git a/content/pages/500.md b/content/pages/500.md
deleted file mode 100644 (file)
index c7d423b..0000000
--- a/content/pages/500.md
+++ /dev/null
@@ -1,6 +0,0 @@
-title: 500 - Internal Server Error
-slug: 500
----
-Something went wrong, and we have no one to blame.
-
-Try reloading the page in a moment, or go back to the [Start page](index).
\ No newline at end of file

diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755 (executable)
index 1410092..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ ! -f .deploy-key ]; then exit; fi
-if [ -z "$TRAVIS_BRANCH" ]; then exit; fi
-
-BRANCH_DIR="$TRAVIS_BRANCH"
-
-if [ "$TRAVIS_PULL_REQUEST" != false ]; then
-    if [ "$TRAVIS_BRANCH" != master ]; then exit; fi
-
-    BRANCH_DIR="pull-$TRAVIS_PULL_REQUEST"
-fi
-
-export SSH_KEYFILE="$(readlink -f .deploy-key)"
-export GIT_SSH="$(readlink -f ssh.sh)"
-git clone -b gh-pages git@github.com:freenode/web-7.0.git .deploy || exit 1
-cd .deploy || exit 1
-git config user.name travis
-git config user.email travis@nowhere
-git rm -r "$BRANCH_DIR/*"
-mkdir -p "$BRANCH_DIR"
-cd "$BRANCH_DIR" || exit 1
-cp -r ../../out/* .
-git add -A
-git commit -m "travis: $TRAVIS_COMMIT"
-git push || exit 1

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
new file mode 100755 (executable)
index 0000000..488c37e
--- /dev/null
+++ b/deploy/deploy.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+if [ ! -f deploy/key1 ]; then exit; fi
+if [ -z "$TRAVIS_BRANCH" ]; then exit; fi
+
+BRANCH_DIR="$TRAVIS_BRANCH"
+
+if [ "$TRAVIS_PULL_REQUEST" != false ]; then
+    if [ "$TRAVIS_BRANCH" != master ]; then exit; fi
+
+    BRANCH_DIR="pull-$TRAVIS_PULL_REQUEST"
+fi
+
+export SSH_KEYFILE="$(readlink -f deploy/key1)"
+export GIT_SSH="$(readlink -f deploy/ssh.sh)"
+git clone -b gh-pages git@github.com:freenode/web-7.0.git .deploy || exit 1
+cd .deploy || exit 1
+git config user.name travis
+git config user.email travis@nowhere
+git rm -r "$BRANCH_DIR/*"
+mkdir -p "$BRANCH_DIR"
+cd "$BRANCH_DIR" || exit 1
+cp -r ../../out/* .
+git add -A
+git commit -m "travis: $TRAVIS_COMMIT"
+git push || exit 1
+cd ../..
+
+if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false ]; then
+    rm -rf .deploy
+    export SSH_KEYFILE="$(readlink -f deploy/key2)"
+    export GIT_SSH="$(readlink -f deploy/ssh.sh)"
+    git clone git@github.com:freenode/freenode.github.io.git .deploy || exit 1
+    cd .deploy || exit 1
+    git config user.name travis
+    git config user.email travis@nowhere
+    git ls-files -z | grep -vzZE '^(README.md|LICENSE|CNAME)$' | xargs -0 rm -f
+    cp -r ../out/* .
+    git add -A
+    git commit -m "travis: $TRAVIS_COMMIT"
+    git push || exit 1
+    cd ..
+fi

diff --git a/.deploy-key.enc b/deploy/key1.enc
similarity index 100%
rename from .deploy-key.enc
rename to deploy/key1.enc

diff --git a/deploy/key2.enc b/deploy/key2.enc
new file mode 100644 (file)
index 0000000..56ebf7a
Binary files /dev/null and b/deploy/key2.enc differ

diff --git a/ssh.sh b/deploy/ssh.sh
similarity index 100%
rename from ssh.sh
rename to deploy/ssh.sh