remove all references to apache2

PVE/API2/Services.pm

@@ -17,7 +17,7 @@ use IO::File;
 use base qw(PVE::RESTHandler);
 
 my $service_list = {
-    apache => { name => 'WWW', desc => 'Web/API server' },
+    pveproxy => { name => 'WWW', desc => 'Web/API server' },
     postfix => { name => 'SMTP', desc => 'Simple Mail Tranfer Protocol' },
     ntpd => { name => 'NTP', desc => 'Network time protocol' },
     sshd => { name => 'SSH', desc => 'Secure shell daemon' },
@@ -58,11 +58,9 @@ my $service_cmd = sub {
 	} else {
 	    die "invalid service cmd '$service $cmd': ERROR";
 	}
-    } elsif  ($service eq 'apache') {
+    } elsif  ($service eq 'pveproxy') {
 	if ($cmd eq 'restart') {    
-	    print "graceful apache restart\n";
-	    $initd_cmd = '/usr/sbin/apache2ctl';
-	    $cmd = 'graceful';
+	    $initd_cmd = '/etc/init.d/pveproxy';
 	} else {
 	    die "invalid service cmd '$service $cmd': ERROR";
 	}
@@ -109,8 +107,8 @@ my $service_state = sub {
 
     if ($service eq 'postfix') {
 	$pid_file = '/var/spool/postfix/pid/master.pid';
-    } elsif  ($service eq 'apache') {
-	$pid_file = '/var/run/apache2.pid';
+    } elsif  ($service eq 'pveproxy') {
+	$pid_file = '/var/run/pveproxy/pveproxy.pid';
     } elsif  ($service eq 'pvedaemon') {
 	$pid_file = '/var/run/pvedaemon.pid';
     } elsif  ($service eq 'pvecluster') {

README

@@ -9,8 +9,6 @@ TODO:
 
     - write a widget to render a JSON Schema (parameters, returns)
 
-  * use nginx/fastcgi instead of apache2 to save resources?
- 	
   * impl. logfile search (like pmg tracking center)
 
 

bin/init.d/pve-manager

@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:        pve-manager
-# Required-Start:  $remote_fs apache2 qemu-server +vz pvestatd
-# Required-Stop:   $remote_fs apache2 qemu-server +vz pvestatd
+# Required-Start:  $remote_fs pveproxy qemu-server +vz pvestatd
+# Required-Stop:   $remote_fs pveproxy qemu-server +vz pvestatd
 # Default-Start:   2 3 4 5
 # Default-Stop:    0 1 6
 # Short-Description: PVE VM Manager

bin/init.d/pvedaemon

@@ -4,8 +4,6 @@
 # Provides:        pvedaemon
 # Required-Start:  $remote_fs $network $syslog pve-cluster cman clvm
 # Required-Stop:   $remote_fs $network $syslog pve-cluster cman clvm
-# X-Start-Before:  apache2
-# X-Stop-After:    apache2
 # Default-Start:   2 3 4 5
 # Default-Stop:    0 1 6
 # Short-Description: PVE Daemon

www/manager/node/ServiceView.js

@@ -81,7 +81,7 @@ Ext.define('PVE.node.ServiceView', {
 	    }
 	    var service = rec.data.service;
 	    var state = rec.data.state;
-	    if (service == 'apache' ||
+	    if (service == 'pveproxy' ||
 		service == 'pvecluster' ||
 		service == 'pvedaemon') {
 		if (state == 'running') {