Merge branch 'master' of vcs.fsf.org:fsf-giving-guide

diff --git a/hooks/post-update b/hooks/post-update
new file mode 100755 (executable)
index 0000000..b737c4b
--- /dev/null
+++ b/hooks/post-update
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+local_checkout=/home/git/local/checkouts/fsf-giving-guide
+
+case $1 in
+    refs/heads/master)
+        ;;
+    *)
+        echo
+        echo "use the 'master' branch to update the gift giving site."
+        echo
+        exit 0
+        ;;
+esac
+
+unset GIT_DIR
+echo Deploying to fsf.org...
+
+cd $local_checkout
+echo Updating local checkout...
+git pull
+git reset --hard $1
+echo Copying files...
+# A lot of files that we *don't* want to copy, so we're selective.
+rsync -az --delete --prune-empty-dirs \
+    --include='*/' --include='givingguide.html' --include='js/*' \
+    --include='images/*' --include='fonts/*' --include='*.css' --exclude='*' \
+    /home/git/local/checkouts/fsf-giving-guide \
+    vcshookuser@fsf.org:/var/www/ #2>/dev/null
+echo Fixing permissions on webserver...
+ssh vcshookuser@fsf.org 'find /var/www/fsf-giving-guide -type f -print0 | xargs -0 chmod 664 && find /var/www/fsf-giving-guide -type d -print0 | xargs -0 chmod 775' # 2>/dev/null
+exec git update-server-info

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 1f3a22f12d8fdaf6420bb0c8349b58ca36d1d182..9eda5ed32e270c31d98018fa1282c5cfe40e6bed 100644 (file)
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -182,7 +182,7 @@
         <h2 class="title text-center">Smartphones</h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-            <img src="/v8/img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
             <h5 class="text-center">Galaxy Note 2 with Replicant</h5>
 
             <!-- Buy/Download Button   -->