enabling the 2021 live streaming page

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

diff --git a/2018/README.md b/2018/README.md
index c78c5aa8ee5b9870065c0622ed1804fbd71fbf4a..ca16e066627b5f555374f36002469f7e8cfd811d 100644 (file)
--- a/2018/README.md
+++ b/2018/README.md
@@ -45,7 +45,7 @@ Here are specific instructions for more complex editing tasks:
 
 The workflow for this is Edit the Brains page with the schedule, then run a script to convert it into HTML and dump it into your checkout of the repo, then push that change up to the Web like any other edit.
 
-See instructions at <https://ricketyspace.net/lpschedule-generator> for installing and running the script. The source files are stored in Brains in markdown but with special tags, so that you can edit them without needing to know this whole process. The jinja2 templates are stored in the the Web site's git repo at assets/templates.
+See instructions at <https://ricketyspace.net/lpschedule-generator> for installing and running the script. The source files are stored in Brains in markdown but with special tags, so that you can edit them without needing to know this whole process.
 
 Please crop all photos of speakers too 100x100 px (200x200 px for keynotes) and then upload them to <http://static.fsf.org/nosvn/libreplanet/speaker-pics/>. Then include their URL in the bios page to embed them.
 
@@ -121,10 +121,10 @@ Modifying Apache's configuration files and running its executables
 typically requires root access.  So, you will most likely need to run
 the commands below as the root user using `sudo`.
 
-*Enable server-side include module*
+*Enable required modules*
 
 ```
-a2enmod include
+a2enmod include rewrite
 ```
 
 If this doesn't work, you may not have Apache installed. Install the
@@ -132,15 +132,15 @@ package apache2 from your package manager.
 
 *Create virtual host*
 
-Create a new file called libreplanet (libreplanet.conf for Apache 2.4) in `/etc/apache2/sites-available` with the following contents:
+Create a new file called libreplanet.conf in `/etc/apache2/sites-available` with the following contents:
 
 ```
 <VirtualHost *:80>
 RewriteEngine on
         ServerName local-dev.libreplanet.org
         ServerAdmin webmaster@localhost
-        DocumentRoot /local-path/path-to-site
-        <Directory /local-path/path-to-site/>
+        DocumentRoot /path-to-site
+        <Directory /path-to-site/>
             Options Indexes FollowSymLinks MultiViews
             AllowOverride All
             Require all granted
@@ -151,19 +151,25 @@ RewriteEngine on
             Options +Includes
             XBitHack on
         </Directory>
-        ErrorLog /home/owner/libreplanet-static/logs/error.log
-        CustomLog /home/owner/libreplanet-static/access.log combined
+        ErrorLog /path-to-site/logs/error.log
+        CustomLog /path-to-site/logs/access.log combined
 </VirtualHost>
 ```
 
-Replace all instances of `/path/to/libreplanet-static` with the full path to the root directory of your local
+Replace all instances of `/path-to-site` and  with the full path to the root directory of your local
 git repository.
 
+* Create the logs directory, as a normal user *
+```
+mkdir /path-to-site/logs
+chmod 777 /path-to-site/logs
+```
+
+
 *Enable virtual host*
 
 ```
-a2ensite your-virtual-host
-* Do not need to do this -mdb
+a2ensite libreplanet
 ```
 
 Replace `your-virtual-host` with the name of virtual host file you made (in this case, libreplanet).
@@ -172,23 +178,19 @@ Replace `your-virtual-host` with the name of virtual host file you made (in this
 
 ```
 service apache2 restart
-*  /usr/local/bin/user-apache-restart
-
-If you are mdb, do: user-apache-restart
+*  /etc/init.d/apache2 restart
 
 ```
 
 *Edit your hosts file*
 
-Edit your system's `/etc/hosts` file and add the following to the bottom:
+Edit your system's `/etc/hosts` file and add to the line starting with
+127.0.0.1: `local-dev.libreplanet.org`
 
-```
-127.0.0.1 lp2018.libreplanet.org
-```
 
 *Test*
 
-Visit <http://lp2018.libreplanet.org/2018> in your web browser.  If
+Visit <http://local-dev.libreplanet.org/2018> in your web browser.  If
 everything is configured properly, you will see the LibrePlanet 2018
 site, complete with header, sidebar, and footer.