Merge branch 'stable' of ssh://vcs.fsf.org/libreplanet-static into stable

[libreplanet-static.git] / 2016 / README.md

diff --git a/2016/README.md b/2016/README.md
index 2290051b9f645e372cba654523ba918d3f0b49c1..565023678a96f95249bc4519b93963ee13fb191d 100644 (file)
--- 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: