Just use give the config object to TT

perlDreamer · perlDreamer · commit 707ed08d22d7 · 2011-12-31T12:07:34.000-08:00
diff --git a/wre/lib/WRE/File.pm b/wre/lib/WRE/File.pm
@@ -332,6 +332,7 @@ sub processTemplate {
     }
 
     # add in some template template variables
+    $var->{config}  = $config;
     $var->{databaseHost}  = $config->get("mysql/hostname");
     $var->{databasePort}  = $config->get("mysql/port");
     $var->{nginxPort}     = $config->get("nginx/port");
diff --git a/wre/var/setupfiles/my.cnf b/wre/var/setupfiles/my.cnf
@@ -14,12 +14,7 @@ ft_min_word_len=2
 wait_timeout=600
 query_cache_size=32M
 default-character-set=utf8
-port=[% databasePort %]
-[% IF osName == "windows" %]
-pid-file=c:\data\wre\var\mysql.pid
-datadir=c:\data\wre\var\mysqldata
-lower_case_table_names=2
-[% END %]
+port=[% config.get(database/port) %]
 [% IF osName == "darwin" %]
 lower_case_table_names=2
 [% END %]
diff --git a/wre/var/setupfiles/nginx.conf b/wre/var/setupfiles/nginx.conf
@@ -1,9 +1,9 @@
 user  [% wreUser %];
 worker_processes  10;
 
-error_log  [% wreRoot %]/var/logs/error.log;
+error_log  [% config.getRoot %]/var/logs/error.log;
 
-pid        [% wreRoot %]/var/run/nginx.pid;
+pid        [% config.getRoot %]/var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -33,10 +33,10 @@ http {
     }
 
     location ~ /.* {
-        proxy_pass http://localhost:[% starmanPort %];
+        proxy_pass http://localhost:[% config.get(starman/port) %];
     }
 
     ##Include per-server vhost configuration files.
-    include [% wreRoot %]/etc/*.nginx
+    include [% config.getRoot %]/etc/*.nginx
 
 }

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ sub processTemplate {`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`# add in some template template variables`
	`335`	`+ $var->{config} = $config;`
`335`	`336`	`$var->{databaseHost} = $config->get("mysql/hostname");`
`336`	`337`	`$var->{databasePort} = $config->get("mysql/port");`
`337`	`338`	`$var->{nginxPort} = $config->get("nginx/port");`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`user [% wreUser %];`
`2`	`2`	`worker_processes 10;`
`3`	`3`
`4`		`-error_log [% wreRoot %]/var/logs/error.log;`
	`4`	`+error_log [% config.getRoot %]/var/logs/error.log;`
`5`	`5`
`6`		`-pid [% wreRoot %]/var/run/nginx.pid;`
	`6`	`+pid [% config.getRoot %]/var/run/nginx.pid;`
`7`	`7`
`8`	`8`	`events {`
`9`	`9`	`worker_connections 1024;`
`@@ -33,10 +33,10 @@ http {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`location ~ /.* {`
`36`		`- proxy_pass http://localhost:[% starmanPort %];`
	`36`	`+ proxy_pass http://localhost:[% config.get(starman/port) %];`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`##Include per-server vhost configuration files.`
`40`		`- include [% wreRoot %]/etc/*.nginx`
	`40`	`+ include [% config.getRoot %]/etc/*.nginx`
`41`	`41`
`42`	`42`	`}`