msb/vpanel-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: msb:31c87e65aff3bcd09b9d48edc099be351ce9b1ed
Branches Tags
msb:master
..
compare: msb:5f494efeb0a81620a8426f25a84a53c23ef85c6e
Branches Tags
msb:master

No commits in common. "31c87e65aff3bcd09b9d48edc099be351ce9b1ed" and "5f494efeb0a81620a8426f25a84a53c23ef85c6e" have entirely different histories.
31c87e65af ... 5f494efeb0

4 changed files with 3 additions and 63 deletions
Show Stats Expand all files Collapse all files

4
panel/classes/Panel.php
View File

@ -56,10 +56,6 @@ class Panel {
} }
public static function get($f3) { public static function get($f3) {
/* If DNS admin is not enabled we need to display the server IP to be used for DNS settings */
if ($f3->get('VDNSADMIN') != '1') {
$f3->set('default_ip', $f3->get('SERVER.SERVER_ADDR'));
}
echo \Template::instance()->render('home.html'); echo \Template::instance()->render('home.html');
} }

2
panel/classes/Panel/Vdns/ZonesAdd.php
View File

@ -48,7 +48,7 @@ class ZonesAdd extends \Panel\Vdns {
if ($result_code == 0) { if ($result_code == 0) {
$messages[] = "Zone (Domain Name) $zone has been added to DNS."; $messages[] = "Zone (Domain Name) $zone has been added to DNS.";
$f3->set('SESSION.messages', $messages); $f3->set('SESSION.messages', $messages);
$f3->reroute("/DNS/$zone"); $f3->reroute("/DNS");
} else { } else {
if (count($output) > 0) { if (count($output) > 0) {
foreach ($output as $k=>$output_message) { foreach ($output as $k=>$output_message) {

2
panel/classes/Panel/Vhost/VhostsAdd.php
View File

@ -99,7 +99,7 @@ class VhostsAdd extends \Panel\Vhost {
$messages[] = "Note: New user is being jailed. Setting up the jail environment takes about a minute to complete and is being run in the background now."; $messages[] = "Note: New user is being jailed. Setting up the jail environment takes about a minute to complete and is being run in the background now.";
} }
$f3->set('SESSION.messages', $messages); $f3->set('SESSION.messages', $messages);
$f3->reroute("/Websites/$domain"); $f3->reroute("/Websites");
} else { } else {
$messages[] = "Error adding website."; $messages[] = "Error adding website.";
$f3->set('SESSION.messages', $messages); $f3->set('SESSION.messages', $messages);

58
panel/ui/home.html
View File

@ -1,61 +1,5 @@
<include href="header.html" /> <include href="header.html" />
<h2>Welcome to {{@PACKAGE}}!</h2> Welcome to {{@PACKAGE}}!
<h3>To deploy a new site:</h3>
<br>
<ol>
<check if="{{ @VDNSADMIN=='1' }}">
<true>
<li><a href="{{@BASE}}/DNS/Add">Add DNS</a><br>
<small>It may take a few minutes for DNS to begin working after being added to the system.</small>
</li>
</true>
<false>
<li>Add DNS<br>
This system does not have integrated DNS.<br>
You need to manually add DNS for your domain.<br>
Point your domain to the IP {{ @default_ip }}.<br>
An example of a minimal DNS setup is:<br>
<br>
<table>
<tr>
<th>Name</th>
<th>Type</th>
<th>Value</th>
</tr>
<tr>
<td>example.com</td>
<td>A</td>
<td>{{@default_ip}}</td>
</tr>
<tr>
<td>www.example.com</td>
<td>CNAME</td>
<td>example.com</td>
</tr>
<tr>
<td>example.com</td>
<td>MX</td>
<td>mail.example.com</td>
</tr>
<tr>
<td>mail.example.com</td>
<td>A</td>
<td>{{@default_ip}}</td>
</tr>
</table>
<br>
<small>The Website & Email pages for the domain will provide additional required DNS settings as needed.</small>
</li>
</false>
</check>
<li><a href="{{@BASE}}/Websites/Add">Add Website</a><br>
<small>After adding a website you will be prompted to add a Security Certificate and will be provided with access info for SFTP, MySQL, et cetera.</small>
</li>
<li><a href="{{@BASE}}/Email/Add">Add Email</a><br>
<small>After enabling email for a domain you will be prompted to add a Security Certificate & DKIM, will be able to immediately begin adding email accounts, and will be provided with all required access info for email clients and webmail.
</li>
</ol>
<include href="footer.html" /> <include href="footer.html" />