Improved defaults and commentary in config and Makefiles
authorroot@roadshow
Mon, 12 Feb 2007 12:23:16 +0100
changeset 21cc19e4dfa82
parent 1 f981a60052c8
child 3 9acb3b73527b
Improved defaults and commentary in config and Makefiles
.hgignore
Makefile
etc/config.lua
etc/config.lua.sample
etc/passwd.lua
etc/passwd.lua.sample
     1.1 --- a/.hgignore	Mon Feb 12 02:14:21 2007 +0100
     1.2 +++ b/.hgignore	Mon Feb 12 12:23:16 2007 +0100
     1.3 @@ -1,4 +1,5 @@
     1.4  var
     1.5  content
     1.6 -htdocs/images
     1.7 +htdocs/image
     1.8  htdocs/download
     1.9 +htdocs/report
     2.1 --- a/Makefile	Mon Feb 12 02:14:21 2007 +0100
     2.2 +++ b/Makefile	Mon Feb 12 12:23:16 2007 +0100
     2.3 @@ -1,8 +1,12 @@
     2.4 +#
     2.5 +#	Loona Makefile
     2.6 +#	
     2.7  
     2.8  WWWUSER ?= apache
     2.9  GROUP ?= apache
    2.10  LANGUAGE ?= en
    2.11  
    2.12 +
    2.13  CONTENTDIR ?= content
    2.14  VARDIR ?= var
    2.15  SESSIONDIR ?= $(VARDIR)/sessions
    2.16 @@ -14,13 +18,16 @@
    2.17  	@echo "Loona make targets"
    2.18  	@echo "-------------------------------------------------------------------------------"
    2.19  	@echo "help .......... This help"
    2.20 +	@echo
    2.21  	@echo "modules ....... Build modules"
    2.22  	@echo "setup ......... Create initial site structure [LANGUAGE: $(LANGUAGE)]"
    2.23  	@echo "permissions ... Set permissions [WWWUSER: $(WWWUSER), GROUP: $(GROUP)]"
    2.24 -	@echo "all ........... All of the above: modules, setup, permissions."
    2.25 +	@echo
    2.26 +	@echo "all ........... All of the above: modules, setup, permissions"
    2.27  	@echo
    2.28  	@echo "NOTE .......... Set environment variables to complement your setup, e.g."
    2.29  	@echo "                % LANGUAGE=de WWWUSER=wwwrun make help"
    2.30 +	@echo "                or make settings persistent by changing them in the Makefile"
    2.31  	@echo
    2.32  
    2.33  clean install modules: 
     3.1 --- a/etc/config.lua	Mon Feb 12 02:14:21 2007 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,39 +0,0 @@
     3.4 --------------------------------------------------------------------------------
     3.5 ---
     3.6 ---	etc/config.lua - Loona Configuration file
     3.7 ---
     3.8 --------------------------------------------------------------------------------
     3.9 -
    3.10 --- password file --------------------------------------------------------------
    3.11 --- passwdfile = "../etc/passwd.lua";
    3.12 -
    3.13 --- session directory ----------------------------------------------------------
    3.14 --- sessiondir = "../var/sessions";
    3.15 -
    3.16 --- extensions directory -------------------------------------------------------
    3.17 --- extdir = "../extensions";
    3.18 -	
    3.19 --- content directory ----------------------------------------------------------
    3.20 --- contentdir = "../content";
    3.21 -	
    3.22 --- locale directory -----------------------------------------------------------
    3.23 --- localedir = "../locale";
    3.24 -
    3.25 --- enable debugging facilities ------------------------------------------------
    3.26 --- debug = true;
    3.27 -
    3.28 --- cache rendered html --------------------------------------------------------
    3.29 --- cachehtml = false;
    3.30 -
    3.31 --- default/fallback section name ----------------------------------------------
    3.32 --- defname = "home";
    3.33 -
    3.34 --- default language -----------------------------------------------------------
    3.35 --- deflang = "de";
    3.36 -
    3.37 --- use preferred language hint ------------------------------------------------
    3.38 --- browserlang = false;
    3.39 -
    3.40 --- max age of a session [seconds] ---------------------------------------------
    3.41 --- sessionmaxage = 600;
    3.42 -
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/etc/config.lua.sample	Mon Feb 12 12:23:16 2007 +0100
     4.3 @@ -0,0 +1,49 @@
     4.4 +-------------------------------------------------------------------------------
     4.5 +--
     4.6 +--	etc/config.lua - Loona Configuration file
     4.7 +--	
     4.8 +--	Uncomment settings to change their respective defaults,
     4.9 +--	which are denoted below.
    4.10 +--
    4.11 +--	You can use absolute or relative paths. By default, the application
    4.12 +--	is intended to work 'out of the box' from the cgi-bin/ directory
    4.13 +--	without further installation, hence the relative paths.
    4.14 +--
    4.15 +-------------------------------------------------------------------------------
    4.16 +
    4.17 +-- Password file --------------------------------------------------------------
    4.18 +-- passwdfile = "../etc/passwd.lua";
    4.19 +
    4.20 +-- Session directory ----------------------------------------------------------
    4.21 +-- sessiondir = "../var/sessions";
    4.22 +
    4.23 +-- Extensions directory -------------------------------------------------------
    4.24 +-- extdir = "../extensions";
    4.25 +	
    4.26 +-- Content directory ----------------------------------------------------------
    4.27 +-- contentdir = "../content";
    4.28 +	
    4.29 +-- Locale directory -----------------------------------------------------------
    4.30 +-- localedir = "../locale";
    4.31 +
    4.32 +-- Debugging facilities -------------------------------------------------------
    4.33 +-- debug = false;
    4.34 +
    4.35 +-- Cache content rendered to html snippets ------------------------------------
    4.36 +-- cachehtml = false;
    4.37 +
    4.38 +-- Default/fallback section path ----------------------------------------------
    4.39 +-- defname = "home";
    4.40 +
    4.41 +-- Default language -----------------------------------------------------------
    4.42 +-- deflang = "en";
    4.43 +
    4.44 +-- Use language hinted by browser ---------------------------------------------
    4.45 +-- browserlang = false;
    4.46 +
    4.47 +-- Max age of a session [seconds] ---------------------------------------------
    4.48 +-- sessionmaxage = 600;
    4.49 +
    4.50 +-- Portnumber considered to be secure -----------------------------------------
    4.51 +-- secureport = 443;
    4.52 +
     5.1 --- a/etc/passwd.lua	Mon Feb 12 02:14:21 2007 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,3 +0,0 @@
     5.4 -	 
     5.5 -	foo = { username = "foo", password = "bar" },
     5.6 -
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/etc/passwd.lua.sample	Mon Feb 12 12:23:16 2007 +0100
     6.3 @@ -0,0 +1,9 @@
     6.4 +-------------------------------------------------------------------------------
     6.5 +--
     6.6 +--	etc/passwd.lua - Loona passwords
     6.7 +--
     6.8 +-------------------------------------------------------------------------------
     6.9 +
    6.10 +--	admin = { username = "admin", password = "blafasel" },
    6.11 +--	foo = { username = "foo", password = "bar" },
    6.12 +