From e1f7c08a7a2265c5b60e8efcbac8652485f99f30 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Wed, 16 Nov 2011 19:19:47 +0800
Subject: [PATCH] web: Move off from appengine

---
 Makefile.am                  |  6 ++++++
 web/app.yaml                 | 35 -----------------------------------
 web/{bitcoin => bitcoin.txt} |  0
 web/index.html               |  2 +-
 web/nginx.conf               | 16 ++++++++++++++++
 web/upload                   |  3 ---
 6 files changed, 23 insertions(+), 39 deletions(-)
 delete mode 100644 web/app.yaml
 rename web/{bitcoin => bitcoin.txt} (100%)
 create mode 100644 web/nginx.conf
 delete mode 100755 web/upload

diff --git a/Makefile.am b/Makefile.am
index d9615fa..fc960b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,3 +32,9 @@ DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update
+
+.PHONY: upload
+
+upload:
+	rsync -avhz web/nginx.conf server:spek
+	rsync -avhz --delete --exclude="*.in" --exclude="nginx.conf" web/ server:spek/static
diff --git a/web/app.yaml b/web/app.yaml
deleted file mode 100644
index 23f8bb9..0000000
--- a/web/app.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-application: spek-project
-version: 1
-runtime: python
-api_version: 1
-
-handlers:
-- url: /favicon.ico
-  static_files: favicon.ico
-  upload: favicon.ico
-  mime_type: vnd.microsoft.icon
-
-- url: /robots.txt
-  static_files: robots.txt
-  upload: robots.txt
-  mime_type: text/plain
-
-- url: /bitcoin
-  static_files: bitcoin
-  upload: bitcoin
-  mime_type: text/plain
-
-- url: /version
-  static_files: version
-  upload: version
-  mime_type: text/plain
-
-- url: /
-  static_files: index.html
-  upload: index.html
-  mime_type: text/html
-
-- url: /(.*).png
-  static_files: \1.png
-  upload: (.*).png
-  mime_type: image/png
diff --git a/web/bitcoin b/web/bitcoin.txt
similarity index 100%
rename from web/bitcoin
rename to web/bitcoin.txt
diff --git a/web/index.html b/web/index.html
index 0165e09..b5cab40 100644
--- a/web/index.html
+++ b/web/index.html
@@ -92,7 +92,7 @@
       If you like Spek and want to thank its developer feel free to leave a tip:
     </p>
     <p>
-      <a href="/bitcoin"><img src="bitcoin.png" title="Bitcoin" alt="Bitcoin"/></a>&nbsp;&nbsp;<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=ZUUSBRRB2SBRQ&amp;lc=GB&amp;item_name=Spek&amp;item_number=spek&amp;no_note=1&amp;no_shipping=1&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted"><img src="paypal.png" title="Tip with PayPal" alt="Tip with PayPal"/></a>&nbsp;&nbsp;<a href="http://flattr.com/thing/277585/Spek"><img src="flattr.png" alt="Flattr this" title="Flattr this"/></a>&nbsp;&nbsp;<a href="http://amzn.com/w/1RJ8WMVMEAIGF"><img src="amazon.png" alt="Amazon wish list" title="Amazon wish list"/></a>
+      <a href="/bitcoin.txt"><img src="bitcoin.png" title="Bitcoin" alt="Bitcoin"/></a>&nbsp;&nbsp;<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=ZUUSBRRB2SBRQ&amp;lc=GB&amp;item_name=Spek&amp;item_number=spek&amp;no_note=1&amp;no_shipping=1&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted"><img src="paypal.png" title="Tip with PayPal" alt="Tip with PayPal"/></a>&nbsp;&nbsp;<a href="http://flattr.com/thing/277585/Spek"><img src="flattr.png" alt="Flattr this" title="Flattr this"/></a>&nbsp;&nbsp;<a href="http://amzn.com/w/1RJ8WMVMEAIGF"><img src="amazon.png" alt="Amazon wish list" title="Amazon wish list"/></a>
     </p>
 
     <h2>News <a href="http://versia.com/category/spek/feed/atom/"><img src="feed-icon-14x14.png" alt="news feed"/></a></h2>
diff --git a/web/nginx.conf b/web/nginx.conf
new file mode 100644
index 0000000..5766094
--- /dev/null
+++ b/web/nginx.conf
@@ -0,0 +1,16 @@
+server {
+    listen      80;
+    server_name www.spek-project.org;
+    rewrite     ^ http://spek-project.org$request_uri?;
+}
+
+server {
+    listen      80;
+    server_name spek-project.org;
+    root        /home/alexander/spek/static;
+
+    location / {
+         access_log off;
+         expires    1d;
+    }
+}
\ No newline at end of file
diff --git a/web/upload b/web/upload
deleted file mode 100755
index 6dec19a..0000000
--- a/web/upload
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-appcfg.py --email=alexander@kojevnikov.com update `dirname $0`