Merge branch 'visitor_count'

MaStr · MaStr · commit 51aeed697d04 · 2013-08-02T08:01:53.000+02:00
diff --git a/customization/www_librarybox/index.html b/customization/www_librarybox/index.html
@@ -3,6 +3,6 @@
 <meta http-equiv="refresh" content="0;url=http://librarybox.lan/content" />
 </head>
 <body>
-Redirect
+Redirect<img src="../vc_counter.php" />
 </body>
 </html>
diff --git a/customization/www_librarybox/redirect.html b/customization/www_librarybox/redirect.html
@@ -3,6 +3,6 @@
 <meta http-equiv="refresh" content="0;url=http://librarybox.lan/content" />
 </head>
 <body>
-Redirect
+<img src="../vc_counter.php" />Redirect
 </body>
 </html>
diff --git a/piratebox_origin/CHANGELOG b/piratebox_origin/CHANGELOG
@@ -11,6 +11,7 @@ NOTE: This may only be a partial changelog, check github / your package manager
 	* [Fixed] General cleaning
 	* [Removed] [Testing] Executable, we will stick to service based
 * [Fixed] Overwritten saved timestamp with 1970 one
+* [New] possibility in install_piratebox.sh to exchange the hostname easily
 
 === v0.6G ===
 * [Fixed] Hide dot files in directory-listing which are usually hidden files
diff --git a/piratebox_origin/piratebox/piratebox/bin/install_piratebox.sh b/piratebox_origin/piratebox/piratebox/bin/install_piratebox.sh
@@ -18,8 +18,9 @@ if [ -z  $1 ] || [ -z $2 ]; then
   echo "       imageboard     : configures kareha imageboard with Basic configuration"
   echo "                        should be installed in <Piratebox-Folder>/share/board"
   echo "       pyForum        : Simple PythonForum"
-  echo "       station_cnt    : Adds Statio counter to your Box - crontab entry"
-  echo "       flush_dns_reg  : Installs crontask to flush dnsmasq regulary"
+  echo "       station_cnt        : Adds Statio counter to your Box - crontab entry"
+  echo "       flush_dns_reg      : Installs crontask to flush dnsmasq regulary"
+  echo "       hostname  'name'   : Exchanges the Hostname displayed in browser"
   exit 1
 fi
 
@@ -30,6 +31,7 @@ if [ !  -f $1 ] ; then
 fi
 
 #Load config
+PIRATEBOX_CONFIG=$1
 . $1 
 
 if [ $2 = 'pyForum' ] ; then
@@ -148,3 +150,26 @@ if [ $2 = "flush_dns_reg" ] ; then
     [ "$?" != "0" ] && echo "an error occured" && exit 254
     echo "Installed crontab for flushing dnsmasq requlary"
 fi
+
+set_Hostname() {
+	local name=$1 ; shift;
+        echo "
+	<html>
+	<head><title>Redirect...</title>
+	<meta http-equiv='refresh' content='0;url=http://$1/' />
+	<meta http-equiv='cache-control' content='no-cache'>
+	</head>
+	<body>
+	Redirect
+	</body>
+	</html>"  > $WWW_FOLDER/redirect.html
+
+        sed "s|HOST=\"$HOST\"|HOST=\"$name\"|" -i  $PIRATEBOX_CONFIG
+}
+
+if [ $2 = "hostname" ] ; then
+	echo "Switching hostname to $3"
+	set_hostname "$3"
+	echo "..done"
+fi	
+
