No more modproxy!

perlDreamer · perlDreamer · commit c8da00969301 · 2012-01-07T17:29:49.000-08:00
diff --git a/wre/lib/WRE/Nginx.pm b/wre/lib/WRE/Nginx.pm
@@ -114,7 +114,7 @@ sub stop {
     unless ($wreConfig->get("nginx/port") > 1024 || $host->isPrivilegedUser) {
         croak "You are not an administrator on this machine so you cannot stop services with ports 1-1024.";
     }
-    my $cmd = $wreConfig->getRoot("/prereqs/sbin/nginx")." -c ".$wreConfig->getRoot("/etc/modproxy.conf")." -s stop";
+    my $cmd = $wreConfig->getRoot("/prereqs/sbin/nginx")." -c ".$wreConfig->getRoot("/etc/nginx.conf")." -s stop";
     `$cmd`; # catch command line output
     my $count = 0;
     my $success = 0;
@@ -123,7 +123,7 @@ sub stop {
         $count++;
     }
     if ($success) {
-        $wreConfig->set("wreMonitor/modproxyAdministrativelyDown", 1);
+        $wreConfig->set("wreMonitor/nginxAdministrativelyDown", 1);
     }
     return $success;
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ sub stop {`
`114`	`114`	`unless ($wreConfig->get("nginx/port") > 1024 \|\| $host->isPrivilegedUser) {`
`115`	`115`	`croak "You are not an administrator on this machine so you cannot stop services with ports 1-1024.";`
`116`	`116`	`}`
`117`		`- my $cmd = $wreConfig->getRoot("/prereqs/sbin/nginx")." -c ".$wreConfig->getRoot("/etc/modproxy.conf")." -s stop";`
	`117`	`+ my $cmd = $wreConfig->getRoot("/prereqs/sbin/nginx")." -c ".$wreConfig->getRoot("/etc/nginx.conf")." -s stop";`
`118`	`118`	`$cmd`; # catch command line output
`119`	`119`	`my $count = 0;`
`120`	`120`	`my $success = 0;`
`@@ -123,7 +123,7 @@ sub stop {`
`123`	`123`	`$count++;`
`124`	`124`	`}`
`125`	`125`	`if ($success) {`
`126`		`- $wreConfig->set("wreMonitor/modproxyAdministrativelyDown", 1);`
	`126`	`+ $wreConfig->set("wreMonitor/nginxAdministrativelyDown", 1);`
`127`	`127`	`}`
`128`	`128`	`return $success;`
`129`	`129`	`}`