[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-221-gd046c0f

[by Emanuel Schuetze]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, website has been updated
       via  d046c0f94fcfdb0bc4fbbe6bd67b72aa2ec4be06 (commit)
      from  30311914752d56d971390c747619a5dd3a113e84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d046c0f94fcfdb0bc4fbbe6bd67b72aa2ec4be06
Author: Emanuel Schuetze <emanuel at intevation.de>
Date:   Thu Nov 19 14:24:17 2015 +0100

    Update for new gpg4win web server.
    
    * web/Makefile: New rsync remote server.
    * web/dothtaccess, web/switch.php: Delete unused php language detection.

diff --git a/web/Makefile b/web/Makefile
index bfe8c44..e499327 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,7 +1,7 @@
 # Build html from m4 macrofiles
 # $Id$
 #
-# (c)2005,2006 by Intevation GmbH
+# (c)2005,2006,2015 by Intevation GmbH
 # Author(s): Sascha Wilde
 #
 # This is Free Software licensed under the GPL
@@ -16,10 +16,10 @@ SUBDIRS =
 
 # Installation configuration
 INSTALL_DIR = /tmp/gpg4win-www
-ADD_INST_TYPES = *.css *.php *.png
+ADD_INST_TYPES = *.css *.png
 ADD_INST_DIRS = pix img
 
-#USER=$(shell grep "svn+ssh://" .svn/entries | sed -e "s/.*svn+ssh:\/\///g" | sed -e "s/@.*//g" | head -1)
+USER=intevation
 
 CURDIR=$(shell pwd)
 
@@ -47,7 +47,7 @@ change-history-de.htm4: build-history.awk NEWS.last
 online: all
 	echo "Going to put current contents online for www.gpg4win.org ..."
 	rsync -rvPC --perms --chmod=ug+rw,o+r,Dg+s,Da+x,u-s,Fg-s,o-wt --exclude='*.swp' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \
-      $(USER)@wald.intevation.org:/gpg4win/htdocs/
+	$(USER)@www.gpg4win.org:/srv/gpg4win-www/
 
 install: all
 	mkdir -p $(INSTALL_DIR) ;\
diff --git a/web/dothtaccess b/web/dothtaccess
deleted file mode 100644
index 711e135..0000000
--- a/web/dothtaccess
+++ /dev/null
@@ -1 +0,0 @@
-DirectoryIndex switch.php
diff --git a/web/switch.php b/web/switch.php
deleted file mode 100644
index 0eee5c0..0000000
--- a/web/switch.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?PHP
-switch ($_SERVER["HTTP_HOST"]) {
- case "www.gpg4win.de":
- case "gpg4win.de":
-   $target = "index-de.html";
-   break;
- default:
-   $target = "index.html";
- }
-readfile($target);
-?>

-----------------------------------------------------------------------

Summary of changes:
 web/Makefile    |  8 ++++----
 web/dothtaccess |  1 -
 web/switch.php  | 11 -----------
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 web/dothtaccess
 delete mode 100644 web/switch.php


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org