Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6690] branches/1.0/package/webinterface/altweb
|
From: <abe...@us...> - 2014-09-04 16:22:30
|
Revision: 6690
http://sourceforge.net/p/astlinux/code/6690
Author: abelbeck
Date: 2014-09-04 16:22:27 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
web interface, add support for Kamailio if it exists on the image
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/admin/system.php
branches/1.0/package/webinterface/altweb/common/functions.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2014-09-04 14:24:57 UTC (rev 6689)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2014-09-04 16:22:27 UTC (rev 6690)
@@ -44,6 +44,9 @@
$select_reload['fop2'] = 'Restart Asterisk FOP2';
$select_reload['FOP2'] = 'Reload Asterisk FOP2';
}
+if (is_file('/etc/init.d/kamailio')) {
+ $select_reload['kamailio'] = 'Restart Kamailio';
+}
$select_reload['cron'] = 'Reload Cron for root';
$sys_label = array (
@@ -245,6 +248,8 @@
$result = restartPROCESS($process, 43, $result, 'init');
} elseif ($process === 'darkstat') {
$result = restartPROCESS($process, 44, $result, 'init');
+ } elseif ($process === 'kamailio') {
+ $result = restartPROCESS($process, 45, $result, 'init');
} elseif ($process === 'cron') {
$result = updateCRON('root', 30, $result);
}
@@ -286,6 +291,7 @@
$dir === '/mnt/kd/crontabs' ||
$dir === '/mnt/kd/snmp' ||
$dir === '/mnt/kd/fop2' ||
+ $dir === '/mnt/kd/kamailio' ||
$dir === '/mnt/kd/ups' ||
$dir === '/mnt/kd/prosody' ||
$dir === '/mnt/kd/docs' ||
@@ -374,6 +380,8 @@
putHtml('<p style="color: green;">LDAP Server'.statusPROCESS('slapd').'.</p>');
} elseif ($result == 44) {
putHtml('<p style="color: green;">NetStat Server (darkstat)'.statusPROCESS('darkstat').'.</p>');
+ } elseif ($result == 45) {
+ putHtml('<p style="color: green;">Kamailio SIP Server'.statusPROCESS('kamailio').'.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
@@ -572,6 +580,16 @@
}
putHtml('</optgroup>');
}
+ if (is_dir('/mnt/kd/kamailio') && count($globfiles = glob('/mnt/kd/kamailio/*.cfg')) > 0) {
+ putHtml('<optgroup label="———— Kamailio Configs ————">');
+ foreach ($globfiles as $globfile) {
+ if (is_file($globfile) && is_writable($globfile)) {
+ $sel = ($globfile === $openfile) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Kamailio Configuration</option>');
+ }
+ }
+ putHtml('</optgroup>');
+ }
if (is_dir('/mnt/kd/phoneprov/templates') && count($globfiles = glob('/mnt/kd/phoneprov/templates/*.conf')) > 0) {
putHtml('<optgroup label="———— IP Phone Provisioning Templates ————">');
foreach ($globfiles as $globfile) {
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2014-09-04 14:24:57 UTC (rev 6689)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2014-09-04 16:22:27 UTC (rev 6690)
@@ -864,6 +864,15 @@
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/siptlscert.php');
exit;
+ } elseif (isset($_POST['submit_kamailio'])) {
+ $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+ if (is_writable($file = '/mnt/kd/kamailio/kamailio-local.cfg')) {
+ header('Location: /admin/edit.php?file='.$file);
+ exit;
+ } elseif (is_writable($file = '/mnt/kd/kamailio/kamailio.cfg')) {
+ header('Location: /admin/edit.php?file='.$file);
+ exit;
+ }
} elseif (isset($_POST['submit_slapd'])) {
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
if (is_writable($file = '/mnt/kd/slapd.conf')) {
@@ -1005,6 +1014,8 @@
$result = restartPROCESS($process, 43, $result, 'init');
} elseif ($process === 'darkstat') {
$result = restartPROCESS($process, 44, $result, 'init');
+ } elseif ($process === 'kamailio') {
+ $result = restartPROCESS($process, 45, $result, 'init');
}
} else {
$result = 2;
@@ -1091,6 +1102,8 @@
putHtml('<p style="color: green;">LDAP Server'.statusPROCESS('slapd').'.</p>');
} elseif ($result == 44) {
putHtml('<p style="color: green;">NetStat Server (darkstat)'.statusPROCESS('darkstat').'.</p>');
+ } elseif ($result == 45) {
+ putHtml('<p style="color: green;">Kamailio SIP Server'.statusPROCESS('kamailio').'.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 100) {
@@ -1194,6 +1207,10 @@
$sel = ($reboot_restart === 'FOP2') ? ' selected="selected"' : '';
putHtml('<option value="FOP2"'.$sel.'>Reload Asterisk FOP2</option>');
}
+ if (is_file('/etc/init.d/kamailio')) {
+ $sel = ($reboot_restart === 'kamailio') ? ' selected="selected"' : '';
+ putHtml('<option value="kamailio"'.$sel.'>Restart Kamailio</option>');
+ }
putHtml('</select>');
putHtml('–');
?>
@@ -1573,6 +1590,13 @@
putHtml('DNSCrypt Proxy Server:');
putHtml('<input type="submit" value="Configure DNSCrypt" name="submit_dnscrypt" class="button" /></td></tr>');
}
+ if (is_file('/etc/init.d/kamailio') &&
+ (is_file('/mnt/kd/kamailio/kamailio.cfg') || is_file('/mnt/kd/kamailio/kamailio-local.cfg'))) {
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('Kamailio SIP Server:');
+ putHtml('<input type="submit" value="Configure Kamailio" name="submit_kamailio" class="button" /></td></tr>');
+ }
+
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
putHtml('Asterisk SIP-TLS Server Certificate:');
putHtml('<input type="submit" value="SIP-TLS Certificate" name="submit_sip_tls" class="button" /></td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2014-09-04 14:24:57 UTC (rev 6689)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2014-09-04 16:22:27 UTC (rev 6690)
@@ -195,7 +195,7 @@
$srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
$srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
$srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
- $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p"';
+ $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p" -e "s/^kamailio$/&/p"';
$srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^ups$/&/p")';
$srcfile .= $firewall;
$srcfile .= $templates;
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2014-09-04 14:24:57 UTC (rev 6689)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2014-09-04 16:22:27 UTC (rev 6690)
@@ -102,7 +102,7 @@
$running = ' has Restarted and is Running';
$stopped = ' is Stopped';
- if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd') {
+ if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd' || $process === 'kamailio') {
$path .= $process.'/';
} elseif ($process === 'dynamicdns') {
if (is_file($path.'ddclient.pid') || is_file($path.'inadyn.pid')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
