demo code goes in wredemosetup.pl, not wresetup.pl

perlDreamer · perlDreamer · commit 841a6923bd47 · 2012-02-08T11:13:14.000-08:00
diff --git a/wre/sbin/wredemosetup.pl b/wre/sbin/wredemosetup.pl
@@ -38,7 +38,7 @@
     say "Setting up demo files";
     $file->makePath($config->getDomainRoot("/demo"));
     $file->copy($config->getRoot("/var/setupfiles/demo.nginx"), $config->getRoot("/etc/demo.nginx"),
-        { force => 1, templateVars=>{ sitename=>$config->get("demo/hostname") } });
+        { force => 1,  processTemplate => 1, );
 }
 else {
     say "Skipping demo files";
diff --git a/wre/sbin/wresetup.pl b/wre/sbin/wresetup.pl
@@ -57,13 +57,6 @@
     { force => 1 });
 $file->changeOwner($config->getWebguiRoot("/etc"));
 
-if ($config->get('demo/enabled') {
-    say "Setting up demo server";
-    $file->copy($config->getRoot("/var/setupfiles/demo.nginx"),
-        $config->getRoot("/etc/demo.nginx"),
-        { force => 1, processTemplate => 1, });
-}
-
 say "Setting up WebGUI logging";
 eval {
     open my $in, '<', $config->getWebguiRoot("/etc/log.conf.original")

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`say "Setting up demo files";`
`39`	`39`	`$file->makePath($config->getDomainRoot("/demo"));`
`40`	`40`	`$file->copy($config->getRoot("/var/setupfiles/demo.nginx"), $config->getRoot("/etc/demo.nginx"),`
`41`		`- { force => 1, templateVars=>{ sitename=>$config->get("demo/hostname") } });`
	`41`	`+ { force => 1, processTemplate => 1, );`
`42`	`42`	`}`
`43`	`43`	`else {`
`44`	`44`	`say "Skipping demo files";`