Skip to content

Commit 313e336

Browse files
tbrehmtbrehm
committed
Added http error and standard index pages, enhanced apache module, added daily cron script
1 parent f963c97 commit 313e336

File tree

129 files changed

+5028
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+5028
-3
lines changed

‎install/install.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@
133133
// Configure MyDNS
134134
swriteln('Configuring MyDNS');
135135
$inst->configure_mydns();
136+
137+
// Configure Apache
138+
swriteln('Configuring Apache');
139+
$inst->configure_apache();
136140

137141
// Configure ISPConfig
138142
swriteln('Installing ISPConfig');
@@ -219,6 +223,12 @@
219223
system("/etc/init.d/mydns restart");
220224
}
221225

226+
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
227+
// Configure Apache
228+
swriteln('Configuring Apache');
229+
$inst->configure_apache();
230+
}
231+
222232
if(strtolower($inst->simple_query('Install ISPConfig',array('y','n'),'y')) == 'y') {
223233
// Configure ISPConfig
224234
swriteln('Installing ISPConfig');

‎install/lib/installer_base.lib.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,14 @@ function configure_mydns() {
566566

567567
}
568568

569+
function configure_apache() {
570+
global $conf;
571+
572+
// Create the logging directory for the vhost logfiles
573+
exec("mkdir -p /var/log/ispconfig/httpd");
574+
575+
}
576+
569577

570578
function install_ispconfig() {
571579
global $conf;

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ CREATE TABLE `server` (
424424
-- Daten für Tabelle `server`
425425
--
426426

427-
INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 1, 'riud', 'riud', 'r', 'Server 1', 1, 1, 1, 1, 1, 1, '[global]\nwebserver=apache\nmailserver=postfix\ndnsserver=mydns\n\n[mail]\nmodule=postfix_mysql\nmaildir_path=/home/vmail/[domain]/[localpart]/\nhomedir_path=/home/vmail/\nmailuser_uid=5000\nmailuser_gid=5000\nmailuser_name=vmail\nmailuser_group=vmail\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n\n[web]\nwebsite_path=/var/clients/client[client_id]/web[website_id]\nwebsite_symlinks=/var/www/[website_domain]/:/var/clients/client[client_id]/[website_domain]/\nvhost_conf_dir=/etc/apache2/sites-available\nvhost_conf_enabled_dir=/etc/apache2/sites-enabled\n\n', 0, 1);
427+
INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES
428+
(1, 1, 1, 'riud', 'riud', 'r', 'Server 1', 1, 1, 1, 1, 1, 1, '[global]\nwebserver=apache\nmailserver=postfix\ndnsserver=mydns\n\n[server]\nip_address=192.168.0.105\nnetmask=255.255.255.0\ngateway=192.168.0.1\nhostname=server1.example.com\nnameservers=193.174.32.18,145.253.2.75\n\n[mail]\nmodule=postfix_mysql\nmaildir_path=/home/vmail/[domain]/[localpart]/\nhomedir_path=/home/vmail/\nmailuser_uid=5000\nmailuser_gid=5000\nmailuser_name=vmail\nmailuser_group=vmail\nrelayhost=\nrelayhost_user=\nrelayhost_password=\nmailbox_size_limit=0\nmessage_size_limit=0\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n\n[web]\nwebsite_path=/var/clients/client[client_id]/web[website_id]\nwebsite_symlinks=/var/www/[website_domain]/:/var/clients/client[client_id]/[website_domain]/\nvhost_conf_dir=/etc/apache2/sites-available\nvhost_conf_enabled_dir=/etc/apache2/sites-enabled\n\n', 0, 1);
428429

429430
-- --------------------------------------------------------
430431

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,13 @@ NameVirtualHost *:8080
2424
CustomLog /var/log/apache2/access.log combined
2525
ServerSignature Off
2626

27-
</VirtualHost>
27+
</VirtualHost>
28+
29+
###########################################
30+
# Logfile configuration for vlogger
31+
###########################################
32+
33+
LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
34+
CustomLog "| /usr/sbin/vlogger -s access.log /var/log/ispconfig/httpd" combined_ispconfig
35+
36+

‎install/update.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@
136136
swriteln('Configuring MyDNS');
137137
$inst->configure_mydns();
138138

139+
// Configure Apache
140+
swriteln('Configuring Apache');
141+
$inst->configure_apache();
142+
139143
// Configure ISPConfig
140144
swriteln('Installing ISPConfig');
141145
$inst->install_ispconfig();

‎server/conf/error/br/authorizationRequired.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<HTML>
2+
<HEAD>
3+
<TITLE>Erro 401 - Autorização necessária!</TITLE>
4+
</HEAD>
5+
<BODY BGCOLOR="#FFFFFF" leftMargin=0 topMargin=0 rightMargin=0 marginheight="0" marginwidth="0">
6+
<CENTER>
7+
<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0">
8+
<TR>
9+
<TD BGCOLOR="#025CCA" ALIGN="CENTER">
10+
<HR SIZE="1" COLOR="#FFFFFF">
11+
<TABLE>
12+
<TR>
13+
<TD><FONT SIZE="3" COLOR="#FFFFFF" FACE="Helvetica, Arial"><B>Erro 401 - Autorização necessária!</B></FONT></TD>
14+
</TR>
15+
</TABLE>
16+
<HR SIZE="1" COLOR="#FFFFFF">
17+
</TD>
18+
</TR>
19+
<TR>
20+
<TD><BR><BR><BR>
21+
<CENTER><FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial"><B><U>O seguinte erro ocorreu:</U></B></FONT></CENTER>
22+
<BR></TD>
23+
</TR>
24+
<TR>
25+
<TD BGCOLOR="#FFFFFF">
26+
<CENTER>
27+
<FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial">A página solicitada requer autorização.
28+
<P>Por favor, entre em contato com o webmaster para maiores esclarecimentos.</FONT>
29+
</CENTER>
30+
<BR>
31+
<HR SIZE="1" WIDTH="90%">
32+
<CENTER>
33+
<FONT SIZE="1" COLOR="#000000" FACE="Verdana, Arial">powered by <A HREF="http://www.ispconfig.org">ISPConfig</A></FONT>
34+
</CENTER>
35+
</TD>
36+
</TR>
37+
</TABLE>
38+
</CENTER>
39+
</BODY>
40+
</HTML>

‎server/conf/error/br/fileNotFound.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<HTML>
2+
<HEAD>
3+
<TITLE>Erro 404 - Arquivo não encontrado!</TITLE>
4+
</HEAD>
5+
<BODY BGCOLOR="#FFFFFF" leftMargin=0 topMargin=0 rightMargin=0 marginheight="0" marginwidth="0">
6+
<CENTER>
7+
<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0">
8+
<TR>
9+
<TD BGCOLOR="#025CCA" ALIGN="CENTER">
10+
<HR SIZE="1" COLOR="#FFFFFF">
11+
<TABLE>
12+
<TR>
13+
<TD><FONT SIZE="3" COLOR="#FFFFFF" FACE="Helvetica, Arial"><B>Erro 404 - Arquivo não encontrado!</B></FONT></TD>
14+
</TR>
15+
</TABLE>
16+
<HR SIZE="1" COLOR="#FFFFFF">
17+
</TD>
18+
</TR>
19+
<TR>
20+
<TD><BR><BR><BR>
21+
<CENTER><FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial"><B><U>O seguinte erro ocorreu:</U></B></FONT></CENTER>
22+
<BR></TD>
23+
</TR>
24+
<TR>
25+
<TD BGCOLOR="#FFFFFF">
26+
<CENTER>
27+
<FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial">A página requisitada não foi encontrada.
28+
<P>Por favor verifique o caminho ou entre em contato com o webmaster.</FONT>
29+
</CENTER>
30+
<BR>
31+
<HR SIZE="1" WIDTH="90%">
32+
<CENTER>
33+
<FONT SIZE="1" COLOR="#000000" FACE="Verdana, Arial">powered by <A HREF="http://www.ispconfig.org">ISPConfig</A></FONT>
34+
</CENTER>
35+
</TD>
36+
</TR>
37+
</TABLE>
38+
</CENTER>
39+
</BODY>
40+
</HTML>

‎server/conf/error/br/forbidden.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<HTML>
2+
<HEAD>
3+
<TITLE>Erro 403 - Proibido!</TITLE>
4+
</HEAD>
5+
<BODY BGCOLOR="#FFFFFF" leftMargin=0 topMargin=0 rightMargin=0 marginheight="0" marginwidth="0">
6+
<CENTER>
7+
<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0">
8+
<TR>
9+
<TD BGCOLOR="#025CCA" ALIGN="CENTER">
10+
<HR SIZE="1" COLOR="#FFFFFF">
11+
<TABLE>
12+
<TR>
13+
<TD><FONT SIZE="3" COLOR="#FFFFFF" FACE="Helvetica, Arial"><B>Erro 403 - Proibido!</B></FONT></TD>
14+
</TR>
15+
</TABLE>
16+
<HR SIZE="1" COLOR="#FFFFFF">
17+
</TD>
18+
</TR>
19+
<TR>
20+
<TD><BR><BR><BR>
21+
<CENTER><FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial"><B><U>O seguinte erro ocorreu:</U></B></FONT></CENTER>
22+
<BR></TD>
23+
</TR>
24+
<TR>
25+
<TD BGCOLOR="#FFFFFF">
26+
<CENTER>
27+
<FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial">Você não está autorizado a acessar a página requisitada
28+
<P>Por favor, entre em contato com o webmaster para maiores esclarecimentos.</FONT>
29+
</CENTER>
30+
<BR>
31+
<HR SIZE="1" WIDTH="90%">
32+
<CENTER>
33+
<FONT SIZE="1" COLOR="#000000" FACE="Verdana, Arial">powered by <A HREF="http://www.ispconfig.org">ISPConfig</A></FONT>
34+
</CENTER>
35+
</TD>
36+
</TR>
37+
</TABLE>
38+
</CENTER>
39+
</BODY>
40+
</HTML>

‎server/conf/error/br/internalServerError.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<HTML>
2+
<HEAD>
3+
<TITLE>Erro 500 - Erro interno do servidor!</TITLE>
4+
</HEAD>
5+
<BODY BGCOLOR="#FFFFFF" leftMargin=0 topMargin=0 rightMargin=0 marginheight="0" marginwidth="0">
6+
<CENTER>
7+
<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0">
8+
<TR>
9+
<TD BGCOLOR="#025CCA" ALIGN="CENTER">
10+
<HR SIZE="1" COLOR="#FFFFFF">
11+
<TABLE>
12+
<TR>
13+
<TD><FONT SIZE="3" COLOR="#FFFFFF" FACE="Helvetica, Arial"><B>Erro 500 - Erro interno do servidor!</B></FONT></TD>
14+
</TR>
15+
</TABLE>
16+
<HR SIZE="1" COLOR="#FFFFFF">
17+
</TD>
18+
</TR>
19+
<TR>
20+
<TD><BR><BR><BR>
21+
<CENTER><FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial"><B><U>O seguinte erro ocorreu:</U></B></FONT></CENTER>
22+
<BR></TD>
23+
</TR>
24+
<TR>
25+
<TD BGCOLOR="#FFFFFF">
26+
<CENTER>
27+
<FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial">A página requisitada causou um erro interno no servidor.
28+
<P>Por favor, entre em contato com o webmaster caso continue a ver esta mensagem.</FONT>
29+
</CENTER>
30+
<BR>
31+
<HR SIZE="1" WIDTH="90%">
32+
<CENTER>
33+
<FONT SIZE="1" COLOR="#000000" FACE="Verdana, Arial">powered by <A HREF="http://www.ispconfig.org">ISPConfig</A></FONT>
34+
</CENTER>
35+
</TD>
36+
</TR>
37+
</TABLE>
38+
</CENTER>
39+
</BODY>
40+
</HTML>

‎server/conf/error/br/invalidSyntax.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<HTML>
2+
<HEAD>
3+
<TITLE>Erro 400 - Sintaxe inválida!</TITLE>
4+
</HEAD>
5+
<BODY BGCOLOR="#FFFFFF" leftMargin=0 topMargin=0 rightMargin=0 marginheight="0" marginwidth="0">
6+
<CENTER>
7+
<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0">
8+
<TR>
9+
<TD BGCOLOR="#025CCA" ALIGN="CENTER">
10+
<HR SIZE="1" COLOR="#FFFFFF">
11+
<TABLE>
12+
<TR>
13+
<TD><FONT SIZE="3" COLOR="#FFFFFF" FACE="Helvetica, Arial"><B>Erro 400 - Sintaxe inválida!</B></FONT></TD>
14+
</TR>
15+
</TABLE>
16+
<HR SIZE="1" COLOR="#FFFFFF">
17+
</TD>
18+
</TR>
19+
<TR>
20+
<TD><BR><BR><BR>
21+
<CENTER><FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial"><B><U>O seguinte erro ocorreu:</U></B></FONT></CENTER>
22+
<BR></TD>
23+
</TR>
24+
<TR>
25+
<TD BGCOLOR="#FFFFFF">
26+
<CENTER>
27+
<FONT COLOR="#000000" SIZE="2" FACE="Helvetica, Arial">Você utilizou uma sintaxe inválida.
28+
<P>Por favor, entre em contato com o webmaster para maiores esclarecimentos.</FONT>
29+
</CENTER>
30+
<BR>
31+
<HR SIZE="1" WIDTH="90%">
32+
<CENTER>
33+
<FONT SIZE="1" COLOR="#000000" FACE="Verdana, Arial">powered by <A HREF="http://www.ispconfig.org">ISPConfig</A></FONT>
34+
</CENTER>
35+
</TD>
36+
</TR>
37+
</TABLE>
38+
</CENTER>
39+
</BODY>
40+
</HTML>

0 commit comments

Comments
 (0)