exflickr · straup · Jan 27, 2014 · Jan 27, 2014 · Jan 27, 2014 · Apr 26, 2014
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+*~
+*#
+.git/*
+.vagrant/*
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *~
-www/include/config.php
+.DS_Store
 .vagrant
+www/include/secrets*.php
 tests/coverage.state
 coverage/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,34 @@
+FROM ubuntu:14.04
+MAINTAINER Micah Walter <[email protected]>
+
+# Install base packages
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        curl \
+        apache2 \
+        libapache2-mod-php5 \
+        php5-mysql \
+        php5-mcrypt \
+        php5-gd \
+        php5-curl \
+        php-pear \
+        php-apc && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN /usr/sbin/php5enmod mcrypt
+RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf && \
+    sed -i "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini
+
+ENV ALLOW_OVERRIDE **True**
+
+# Add image configuration and scripts
+ADD build/docker/run.sh /run.sh
+RUN chmod 755 /*.sh
+
+# Configure /app folder with sample app
+RUN mkdir -p /app && rm -fr /var/www/html && ln -s /app /var/www/html
+ADD www/ /app
+
+EXPOSE 80
+WORKDIR /app
+CMD ["/run.sh"]
diff --git a/README.md b/README.md
@@ -24,11 +24,11 @@ piece of the puzzle, please send a pull-request.
 
 That's it.
 
-For a longer version, read the <a href="/docs/install_base.md">installation guide</a>.
+For a longer version, read the <a href="http://cooperhewitt.github.io/flamework/articles/install_base">installation guide</a>.
 
-If you'd like to use Flamework as an external library, <a href="/docs/install_external.md">read this</a>.
+If you'd like to use Flamework as an external library, <a href="http://cooperhewitt.github.io/flamework/articles/install_external">read this</a>.
 
-To install Flamework on AppFog.com, <a href="/docs/install_appfog.md">read this</a>.
+To install Flamework on AppFog.com, <a href="http://cooperhewitt.github.io/flamework/articles/install_appfog">read this</a>.
 
 
 ##Global Variables
@@ -47,10 +47,10 @@ Some libraries use their own globals internally, usually prefixed with `LIBRARYN
 
 ## Other documentation
 
-* <a href="/docs/troubleshooting.md">Troubleshooting</a>
-* <a href="/docs/philosophy.md">Design Philosophy</a>
-* <a href="/docs/database_model.md">Database Model</a>
-* <a href="/docs/style_guide.md">Style guide</a>
+* <a href="http://cooperhewitt.github.io/flamework/articles/troubleshooting">Troubleshooting</a>
+* <a href="http://cooperhewitt.github.io/flamework/articles/philosophy">Design Philosophy</a>
+* <a href="http://cooperhewitt.github.io/flamework/articles/database_model">Database Model</a>
+* <a href="http://cooperhewitt.github.io/flamework/articles/style_guide">Style guide</a>
 
 
 ## Libraries & Tools
@@ -75,7 +75,7 @@ There are several drop-in external libraries for common tasks:
 
 And some random odds and ends:
 
-* <a href="https://github.com/straup/flamework">flamework-tools</a> - Automation scripts
+* <a href="https://github.com/straup/flamework-tools">flamework-tools</a> - Automation scripts
 
 
 ## Tests

diff --git a/Vagrantfile b/Vagrantfile
@@ -1,8 +1,11 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise32"
-  config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.synced_folder "www/templates_c/", "/vagrant/www/templates_c/", owner:"www-data", group:"www-data"
 
   config.vm.network :forwarded_port, guest: 80, host: 8080
 
-  config.vm.provision :shell, :path => "tests/vagrant/init.sh"
+  config.vm.provision :shell, :path => "build/vagrant/init.sh"
+
 end
diff --git a/apache/vagrant-default.conf b/apache/vagrant-default.conf
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+
+		DocumentRoot /var/www/html
+
+		<Directory />
+			Require all granted
+			Options FollowSymLinks
+			AllowOverride None
+		</Directory>
+
+		<Directory /var/www/html/>
+			Options FollowSymLinks Indexes
+			AllowOverride All
+		</Directory>
+
+		ErrorLog ${APACHE_LOG_DIR}/error.log
+
+</VirtualHost>
diff --git a/bin/compile-templates.php b/bin/compile-templates.php
@@ -1,11 +1,6 @@
 <?php
 
-	$root = dirname(dirname(__FILE__));
-	ini_set("include_path", "{$root}/www:{$root}/www/include");
-
-	set_time_limit(0);
-
-	include("include/init.php");
+	include("init_local.php");
 
 	# http://www.smarty.net/docs/en/api.compile.all.templates.tpl (version 3)
 	# $GLOBALS['smarty']->compileAllTemplates('.txt', true);

diff --git a/bin/generate_secret.php b/bin/generate_secret.php
@@ -1,13 +1,6 @@
 <?php
 
-	$root = dirname(dirname(__FILE__));
-	ini_set("include_path", "{$root}/www:{$root}/www/include");
-
-	set_time_limit(0);
-
-	#
-
-	include("include/init.php");
+	include("init_local.php");
 	loadlib("random");
 
 	$length = 32;

diff --git a/bin/init_local.php b/bin/init_local.php
@@ -0,0 +1,8 @@
+<?php
+
+	$root = dirname(dirname(__FILE__));
+	ini_set("include_path", "{$root}/www:{$root}/www/include");
+
+	include("include/init.php");	
+
+	# the end
diff --git a/build/docker/run.sh b/build/docker/run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+chown www-data:www-data /app -R
+
+if [ "$ALLOW_OVERRIDE" = "**False**" ]; then
+    unset ALLOW_OVERRIDE
+else
+    sed -i "s/AllowOverride None/AllowOverride All/g" /etc/apache2/apache2.conf
+    a2enmod rewrite
+fi
+
+source /etc/apache2/envvars
+tail -F /var/log/apache2/* &
+exec apache2 -D FOREGROUND
diff --git a/build/vagrant/init.sh b/build/vagrant/init.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+export DEBIAN_FRONTEND=noninteractive
+
+sudo apt-get update
+sudo apt-get install -y php5-cli git php5-mcrypt php5-curl
+sudo apt-get install -y apache2 libapache2-mod-php5
+sudo apt-get install -y mysql-server php5-mysql
+sudo apt-get install -y memcached php5-memcache
+
+sudo apt-get install emacs24-nox
+
+rm -rf /var/www/html
+ln -fs /vagrant/www /var/www/html
+
+cd /vagrant
+chmod 755 www/templates_c
+
+sudo rm /etc/apache2/sites-enabled/000-default.conf
+sudo ln -s /vagrant/apache/vagrant-default.conf /etc/apache2/sites-enabled/000-default.conf
+
+sudo a2enmod rewrite
+sudo php5enmod mcrypt
+
+/etc/init.d/apache2 start
diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,3 @@
+_site
+.sass-cache
+.jekyll-metadata
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -0,0 +1,12 @@
+title: flamework docs
+
+baseurl: /flamework
+
+# Build settings
+markdown: kramdown
+
+# collections
+collections:
+  docs:
+      output: true
+
diff --git a/docs/database_model.md → docs/_docs/database_model.md b/docs/database_model.md → docs/_docs/database_model.md
@@ -1,3 +1,8 @@
+---
+title: "The flamework database model"
+layout: default
+---
+
 # The Flamework database model
 
 Flamework assumes a federated model with all the various user data spread across a series of databases, 

diff --git a/docs/install_appfog.md → docs/_docs/install_appfog.md b/docs/install_appfog.md → docs/_docs/install_appfog.md
@@ -1,3 +1,8 @@
+---
+title: "Installation - Appfog.com"
+layout: default
+---
+
 # Installation - AppFog.com
 
 Installation on AppFog.com is pretty simple and offers the advantage of being able to easily scale your app and move between infrastructures and data centers. 
@@ -47,4 +52,4 @@ with this
 
 This will open a MySQL connection to your AppFog database. You can then use standard MySQL commands to copy in the schema files found in /yourflameworkfolder/schema. Once this is done, you should be able to create user accounts, etc on your AppFog/Flaework app.
 
-Enjoy.
+Enjoy.
diff --git a/docs/install_base.md → docs/_docs/install_base.md b/docs/install_base.md → docs/_docs/install_base.md
@@ -1,3 +1,8 @@
+---
+title: "Installation - base"
+layout: default
+---
+
 # Installation - As a base for a new project
 
 Get the [code from GitHub](https://github.com/exflickr/flamework).

diff --git a/docs/install_external.md → docs/_docs/install_external.md b/docs/install_external.md → docs/_docs/install_external.md
@@ -1,3 +1,8 @@
+---
+title: "Installation - external"
+layout: default
+---
+
 # Installation - As an external library
 
 Another way to use flamework is to clone it into a subfolder and build

diff --git a/docs/pagination.md → docs/_docs/pagination.md b/docs/pagination.md → docs/_docs/pagination.md
@@ -1,3 +1,8 @@
+---
+title: "Pagination"
+layout: default
+---
+
 # Pagination
 
 Flamework provides helper functions for creating simple or complex pagaing widgets.

diff --git a/docs/philosophy.md → docs/_docs/philosophy.md b/docs/philosophy.md → docs/_docs/philosophy.md
@@ -1,3 +1,8 @@
+---
+title: "Philosophy"
+layout: default
+---
+
 # Flamework Design Philosophy - Statement(s) of Bias
 
 *"Working on the crumbly edge of future-proofing." -- [Heather Champ](http://www.hchamp.com/)*

diff --git a/docs/style_guide.md → docs/_docs/style_guide.md b/docs/style_guide.md → docs/_docs/style_guide.md
@@ -1,3 +1,8 @@
+---
+title: "Style guide"
+layout: default
+---
+
 # Flamework Style guide
 
 The coding style is idiosyncratic and will stay that way. There are no

diff --git a/docs/troubleshooting.md → docs/_docs/troubleshooting.md b/docs/troubleshooting.md → docs/_docs/troubleshooting.md
@@ -1,3 +1,8 @@
+---
+title: "Troubleshooting"
+layout: default
+---
+
 Troubleshooting
 ===============
 

diff --git a/docs/_includes/head.html b/docs/_includes/head.html
@@ -0,0 +1,47 @@
+<head>
+  <!-- Canonical link to help search engines -->
+  <link rel="canonical" href="{{ site.baseurl }}{{ page.url }}"/>
+
+  <!-- Basic meta elements -->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+
+  <!-- Enable responsiveness on mobile devices-->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1"/>
+
+  <!--   Dublin Core metadata for Zotero -->  
+  <meta name="DC.title" content="{{ page.title }}" />
+  <meta name="DC.creator" content="{{ page.author }}" />
+  <meta name="DC.contributor" content="{{ page.editor }}" />
+  <meta name="DC.date" content="{{ page.publication-date }}" />
+  <meta name="DC.rights" content="{{ page.rights }}" />
+  <meta name="DC.source" content="{{ site.title }}" />
+
+  <!-- Open Graph metadata -->
+  <meta property="og:title" content="{{ page.title }}"/>
+  <meta property="og:author" content="{{ page.author }}"/>
+  <meta property="og:book:release_date" content="{{ page.publication-date }}"/>
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="{{ site.url }}"/>
+  <meta property="og:image" content="http://elotroalex.github.io/ed/public/apple-touch-icon-precomposed.png"/>
+
+  <title>
+    {% if page.title == "Home" %}
+      {{ site.title }}
+    {% else %}
+      {{ page.title }}
+    {% endif %}
+  </title>
+
+  <!-- CSS links -->
+  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/syntax.css"/>
+  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/ed.css"/>
+
+
+  <!-- Icons -->
+  <link rel="apple-touch-icon-precomposed" sizes="180x180" href="{{ site.baseurl }}/public/apple-touch-icon-precomposed.png"/>
+  <link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.ico"/>
+
+  <!-- RSS -->
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}/atom.xml"/>
+</head>
diff --git a/docs/_includes/sidebar-toc.html b/docs/_includes/sidebar-toc.html
@@ -0,0 +1,25 @@
+<!-- Target for toggling the sidebar `.sidebar-checkbox` is for regular
+     styles, `#sidebar-checkbox` for behavior. -->
+<input type="checkbox" class="sidebar-checkbox" id="sidebar-checkbox">
+
+<!-- Toggleable sidebar -->
+<div class="sidebar" id="sidebar">
+  <div class="sidebar-item">
+    <p>{{ page.title }}</p>
+  </div>
+
+  <nav class="sidebar-nav">
+    <a class="sidebar-nav-item{% if page.url == site.baseurl %} active{% endif %}" href="{{ site.baseurl }}/">Home</a>
+    <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="#" data-proofer-ignore>Return to Top</a>    
+    {% for node in page.toc %}
+    <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %} sidebar-nav-item-toc" href="#{{ node | slugify }}">{{ node }}</a>
+    {% endfor %}
+
+  </nav>
+
+  <div class="sidebar-item">
+    <p>
+     Edited by {{ page.editor }}, {{ site.time | date: '%Y' }}.
+    </p>
+  </div>
+</div>