From f446b67e7c6f3f9ee3a7e1889c496951482b7043 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Tue, 26 Jan 2016 15:36:46 -0500
Subject: [PATCH] Final tweaks to the README.
---
2016/README.md | 40 ++++++++++++++++++----------------------
access.log | 7 +++++++
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/2016/README.md b/2016/README.md
index 2290051b..56502367 100644
--- a/2016/README.md
+++ b/2016/README.md
@@ -40,26 +40,23 @@ Create a new file called libreplanet (libreplanet.conf for Apache 2.4) in `/etc/
```
<VirtualHost *:80>
- ServerName lp2016.libreplanet.org
- DocumentRoot /path/to/libreplanet-static
-
- <Directory />
- Options FollowSymLinks
- AllowOverride All
- </Directory>
- <Directory /path/to/libreplanet-static>
- Options Indexes FollowSymLinks MultiViews
- Options +Includes
- XBitHack on
- AllowOverride All
- Order allow,deny
- # Directive needed in Apache 2.4
- allow from all
- </Directory>
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- LogLevel warn
- CustomLog ${APACHE_LOG_DIR}/access.log combined
+RewriteEngine on
+ ServerName local-dev.libreplanet.org
+ ServerAdmin webmaster@localhost
+ DocumentRoot /local-path/path-to-site
+ <Directory /local-path/path-to-site/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Require all granted
+ Order deny,allow
+ deny from none
+ allow from all
+ SSILegacyExprParser on
+ Options +Includes
+ XBitHack on
+ </Directory>
+ ErrorLog /home/owner/libreplanet-static/logs/error.log
+ CustomLog /home/owner/libreplanet-static/access.log combined
</VirtualHost>
```
@@ -124,8 +121,7 @@ Add HTML markup in-between the sidebar and footer includes.
### Enable SSI
Files that contain include directives must be marked as executable
-otherwise Apache will not parse them. The directive `XBitHack on`
-enables this behavior.
+otherwise Apache will not parse them. (The directive `XBitHack on` in the .conf file pasted above enables this behavior).
To mark a file as executable, run:
diff --git a/access.log b/access.log
index 6b63bce9..33face7b 100644
--- a/access.log
+++ b/access.log
@@ -11,3 +11,10 @@ localhost - - [26/Jan/2016:15:23:49 -0500] "GET /2016/assets/fonts/glyphicons-ha
localhost - - [26/Jan/2016:15:23:49 -0500] "GET /2016/assets/img/favicon.ico HTTP/1.1" 200 1450 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
localhost - - [26/Jan/2016:15:32:37 -0500] "GET /2016/program HTTP/1.1" 301 628 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
localhost - - [26/Jan/2016:15:32:37 -0500] "GET /2016/program/ HTTP/1.1" 200 5184 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:57 -0500] "GET /2016/program/ HTTP/1.1" 200 5214 "-" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/css/bootstrap.min.css HTTP/1.1" 200 20222 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/css/custom.css HTTP/1.1" 200 2959 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/css/jquery-ui-1.9.0.custom.css HTTP/1.1" 200 6472 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/js/bootstrap-3.3.5.min.js HTTP/1.1" 200 10097 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/js/jquery-1.11.3.min.js HTTP/1.1" 200 33633 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
+localhost - - [26/Jan/2016:15:33:58 -0500] "GET /2016/assets/img/site_logo_alternate.png HTTP/1.1" 304 181 "http://local-dev.libreplanet.org/2016/program/" "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Iceweasel/38.5.0"
--
2.25.1