aboutsummaryrefslogtreecommitdiffstats
path: root/notes/INSTALL
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-10 19:52:24 +0000
committerMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-10 19:52:24 +0000
commit73c9ca597e083354d0ea9843ebea319096ce5111 (patch)
tree4fa5864b35365e3a8dd5df7cc438b9530827abd5 /notes/INSTALL
parent4ebfa74ad83b23c253090f682d9bbfa36e2c63f6 (diff)
parentcf347f8fbce0fefa4f8da01a867bfe523bbe5dc0 (diff)
Merge commit 'remotes/origin/migrate_from_osgb36_to_wgs84'
Diffstat (limited to 'notes/INSTALL')
-rw-r--r--notes/INSTALL4
1 files changed, 2 insertions, 2 deletions
diff --git a/notes/INSTALL b/notes/INSTALL
index 5254a6982..fcb1f5579 100644
--- a/notes/INSTALL
+++ b/notes/INSTALL
@@ -82,14 +82,14 @@ mail youremail@example.com # send a test message
cp conf/general-example conf/general
nano conf/general
-# You only need to alter:
+# You may need to alter:
# * the database connection details
# * the OPTION_BASE_URL to be where your test site will run - eg 'http://localhost'
# * the OPTION_EVEL_URL to '' - this will cause some emails not to be sent but warned to STDERR instead - proper email handling is being worked on
# * the OPTION_SMTP_SMARTHOST to '' if routing mail via ssmtp as described above - otherwise your SMTP server
# * set OPTION_EMAIL_VHOST to the same as OPTION_BASE_URL minus the 'http://' - eg 'localhost'
# * set OPTION_UPLOAD_CACHE and OPTION_GEO_CACHE to your preferred values
-
+# * set OPTION_COUNTRY to your ISO3166 alpha2 code ('GB' for the United Kingdom: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
# SETTING UP THE DATABASES
} /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
#!/bin/sh
while :; do
vlc -vv -I dummy --live-caching 0 http://cubemap.tg14.gathering.org/event.flv vlc://quit --sout='#std{access=livehttp{seglen=10,delsegs=true,numsegs=5,index=/srv/stream.tg14.gathering.org/hls/event.m3u8,index-url=http://stream.tg14.gathering.org/hls/event-########.ts},mux=ts{use-key-frames},dst=/srv/stream.tg14.gathering.org/hls/event-########.ts}'
	sleep 2
done