Finish config changes that allow html pages to live in pages subdir

Include an example htaccess file and apache vhost config file that
shows how to configure the webserver.

Signed-off-by: Vernon Mauery <[email protected]>

Author: vmauery

apache-vhost.example

@@ -0,0 +1,42 @@
+<VirtualHost hostname>
+
+	SSLEngine off
+	ServerName hostname
+
+	ServerAdmin webmaster@localhost
+	
+	DocumentRoot /path/to/pyrobox/html/pages
+	ServerRoot /path/to/pyrobox/html/pages
+
+	FastCgiServer /path/to/pyrobox/config.fcgi
+	#FastCgiExternalServer /path/to/pyrobox/config.fcgi -host localhost:4545
+
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /path/to/pyrobox/html/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride All
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	Alias /config/ /path/to/pyrobox/config.fcgi
+
+	Alias /js /path/to/pyrobox/html/js/
+	Alias /css /path/to/pyrobox/html/css/
+	Alias /theme /path/to/pyrobox/html/theme/
+
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog /var/log/apache2/access.log combined
+	ServerSignature On
+
+</VirtualHost>
+

fcgi/config.cpp

@@ -88,7 +88,7 @@ class JSON_Request: public Fastcgipp::Request<char>
 	std::stringstream& form_response(std::stringstream& ss, const std::string& form_name) {
 		here();
 		// build the form
-		std::string form_file_name = "js/json/forms/";
+		std::string form_file_name = "html/js/json/forms/";
 		form_file_name += form_name;
 		std::ifstream form_file;
 		form_file.open(form_file_name.c_str(), std::ios::binary);
@@ -112,7 +112,7 @@ class JSON_Request: public Fastcgipp::Request<char>
 			// send the form (with return code/error info)
 		} else {
 		here();
-			ss << "form: {},\n";
+			ss << form_name << ": {form: {elements:[]}, values: {}, },\n";
 		}
 		return ss;
 	}

html/.htaccess

@@ -8,79 +8,21 @@
 #</FilesMatch>
 
 # Don't show directory listings for URLs which map to a directory.
-#Options -Indexes
+Options -Indexes
 
 # Follow symbolic links in this directory.
 Options +FollowSymLinks
 
-# Customized error messages.
-#ErrorDocument 404 /index.html
-
-# Set the default handler.
-#DirectoryIndex index.html
-
-# Override PHP settings. More in sites/default/settings.php
-# but the following cannot be changed at runtime.
-
-# Requires mod_expires to be enabled.
-#<IfModule mod_expires.c>
-#  # Enable expirations.
-#  ExpiresActive On
-#  # Cache all files for 2 weeks after access (A).
-#  ExpiresDefault A1209600
-#  # Do not cache dynamically generated pages.
-#  ExpiresByType text/html A1
-#</IfModule>
-
 # Various rewrite rules.
 <IfModule mod_rewrite.c>
   RewriteEngine on
 
-  # If your site can be accessed both with and without the 'www.' prefix, you
-  # can use one of the following settings to redirect users to your preferred
-  # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option:
-  #
-  # To redirect all users to access the site WITH the 'www.' prefix,
-  # (http://example.com/... will be redirected to http://www.example.com/...)
-  # adapt and uncomment the following:
-  # RewriteCond %{HTTP_HOST} ^example\.com$ [NC]
-  # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301]
-  #
-  # To redirect all users to access the site WITHOUT the 'www.' prefix,
-  # (http://www.example.com/... will be redirected to http://example.com/...)
-  # uncomment and adapt the following:
-  # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
-  # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301]
-
-  # Modify the RewriteBase if you are using Drupal in a subdirectory or in a
-  # VirtualDocumentRoot and the rewrite rules are not working properly.
-  # For example if your site is at http://example.com/drupal uncomment and
-  # modify the following line:
-  # RewriteBase /drupal
-  #
-  # If your site is running in a VirtualDocumentRoot at http://example.com/,
-  # uncomment the following line:
-  # RewriteBase /
-
-  # Rewrite old-style URLs of the form 'node.php?id=x'.
-  #RewriteCond %{REQUEST_FILENAME} !-f
-  #RewriteCond %{REQUEST_FILENAME} !-d
-  #RewriteCond %{QUERY_STRING} ^id=([^&]+)$
-  #RewriteRule node.php index.php?q=node/view/%1 [L]
-
-  # Rewrite old-style URLs of the form 'module.php?mod=x'.
-  #RewriteCond %{REQUEST_FILENAME} !-f
-  #RewriteCond %{REQUEST_FILENAME} !-d
-  #RewriteCond %{QUERY_STRING} ^mod=([^&]+)$
-  #RewriteRule module.php index.php?q=%1 [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !\.html$
+  RewriteRule ^(.*)$ $1.html [L]
 
-  RewriteCond %{REQUEST_FILENAME} -d
-  RewriteCond ^([.*]/[^[.]*) $1.html
 
-  # Rewrite current-style URLs of the form 'index.php?q=x'.
-  #RewriteCond %{REQUEST_FILENAME} !-f
-  #RewriteCond %{REQUEST_FILENAME} !-d
-  #RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>
 
 DefaultType text/html