From 33d3a1bc3cda1c439f717b40335c64ad121276ab Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 19 Sep 2012 10:45:42 +0200
Subject: [PATCH] Updated maven site and added installation details

---
 pom.xml                              |  5 +++
 src/site/apt/index.apt               |  2 +-
 src/site/apt/installation.apt        | 58 ++++++++++++++++++++++++++++
 src/site/resources/css/thm-theme.css | 15 ++++++-
 src/site/site.xml                    |  6 ++-
 5 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 src/site/apt/installation.apt

diff --git a/pom.xml b/pom.xml
index 8df7a7508..d09601cca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,26 +23,31 @@
 			<name>Julian Hochstetter</name>
 			<organization>Technische Hochschule Mittelhessen</organization>
 			<organizationUrl>http://www.thm.de</organizationUrl>
+			<email>julian.hochstetter@mni.thm.de</email>
 		</developer>
 		<developer>
 			<name>Jan Kammer</name>
 			<organization>Technische Hochschule Mittelhessen</organization>
 			<organizationUrl>http://www.thm.de</organizationUrl>
+			<email>jan.kammer@mni.thm.de</email>
 		</developer>
 		<developer>
 			<name>Daniel Knapp</name>
 			<organization>Technische Hochschule Mittelhessen</organization>
 			<organizationUrl>http://www.thm.de</organizationUrl>
+			<email>daniel.knapp@mni.thm.de</email>
 		</developer>
 		<developer>
 			<name>Christoph Thelen</name>
 			<organization>Technische Hochschule Mittelhessen</organization>
 			<organizationUrl>http://www.thm.de</organizationUrl>
+			<email>christoph.thelen@mni.thm.de</email>
 		</developer>
 		<developer>
 			<name>Paul-Christian Volkmer</name>
 			<organization>Technische Hochschule Mittelhessen</organization>
 			<organizationUrl>http://www.thm.de</organizationUrl>
+			<email>paul-christian.volkmer@mni.thm.de</email>
 		</developer>
 	</developers>
 	
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 2130873ce..c2d6a3646 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -1,5 +1,5 @@
  -----
- ARSNova landingpage
+ ARSnova landingpage
  -----
  SCM-Helpdesk
  -----
diff --git a/src/site/apt/installation.apt b/src/site/apt/installation.apt
new file mode 100644
index 000000000..4999a8661
--- /dev/null
+++ b/src/site/apt/installation.apt
@@ -0,0 +1,58 @@
+ -----
+ ARSNova landingpage
+ -----
+ SCM-Helpdesk
+ -----
+ -----
+
+ 
+Deployment
+
+ You will need to do some configuration work upfront.
+
+  * Add a new directory "arsnova" in /etc and create a copy of arsnova.properties.example named arsnova.properties in this directory.
+  
+  * Change settings to match your environment
+
+Server configuration
+
+ In order to build up a full featured server installation containing ARSnova2 and CouchDB you have to install at least the following services:
+  
+  * Apache Tomcat 7.0.29 (or newer)
+  
+  * Apache Webserver 2.2 or newer with buildin mod_proxy, mod_proxy_ajp and mod_proxy_http
+  
+  * Apache CouchDB
+ 
+ Make sure all services are installed. Next step is to configure the Apache Webserver. Find the configuration file or create a new one for use with a virtal host. This depends on your needs. At least you should have a configuration containing these settings:
+
++--------------------------------------------------------+
+	
+	<Location /couchdb/>
+		ProxyPass http://127.0.0.1:5984/
+		ProxyPassReverse http://127.0.0.1:5984/
+	</Location> 
+	
+	<Location />
+		ProxyPass ajp://127.0.0.1:8009/
+		ProxyPassReverse ajp://127.0.0.1:8009/
+	</Location>
+	
++--------------------------------------------------------+
+
+ This will redirect all requests for "/couchdb/..." to your Apache CouchDB server, running on port 5984.
+ All other requests will be send to your Apache Tomcat servelt container, using AJP running on port 8009.
+
+ To enable the needed Apache Webserver simply type:
+
++---------------------------+
+ 
+  # a2enmod proxy
+  # a2enmod proxy_ajp
+  # a2enmod proxy_http
+ 
++---------------------------+
+
+ The configuration is ready for development usage. 
+
+ Finally you should (re)start all services. ARSnova2 is now listening on HTTP port 80.
\ No newline at end of file
diff --git a/src/site/resources/css/thm-theme.css b/src/site/resources/css/thm-theme.css
index 1385b917c..10484a195 100644
--- a/src/site/resources/css/thm-theme.css
+++ b/src/site/resources/css/thm-theme.css
@@ -6,4 +6,17 @@
 
 #banner {
 	margin: 4px 0;
-}
\ No newline at end of file
+}
+
+body > div > hr {
+	display: none;
+}
+
+footer > div {
+	position: relative;
+}
+
+footer > div .row {
+	position: absolute;
+	bottom: 8px;
+}
diff --git a/src/site/site.xml b/src/site/site.xml
index 2083090f9..11d8d849a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,11 +12,11 @@
 
 	<custom>
 		<fluidoSkin>
-			<topBarEnabled>true</topBarEnabled>
+			<topBarEnabled>false</topBarEnabled>
 			<topBar>
 			
 			</topBar>
-			<sideBarEnabled>false</sideBarEnabled>
+			<sideBarEnabled>true</sideBarEnabled>
 			<profile>release</profile>
 			<ohloh>
 				<projectId>arsnova</projectId>
@@ -47,6 +47,8 @@
 		<menu name="Overview">
 			<item name="Introduction" href="index.html" />
 			<item name="Dependencies" href="dependencies.html" />
+			<item name="Installation" href="installation.html" />
+			<item name="License" href="license.html" />
 			<item name="The Team" href="team-list.html" />
 		</menu>
 		<menu name="Further Information">
-- 
GitLab