Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Zvonimir
ISPConfig 3
Commits
526b997c
Commit
526b997c
authored
Feb 22, 2013
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged revisions 3803-3844 from stable branch.
parent
72695f03
Changes
465
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
544 additions
and
161 deletions
+544
-161
install/dist/conf/centos52.conf.php
install/dist/conf/centos52.conf.php
+1
-0
install/dist/conf/centos53.conf.php
install/dist/conf/centos53.conf.php
+1
-0
install/dist/conf/debian40.conf.php
install/dist/conf/debian40.conf.php
+1
-0
install/dist/conf/debian60.conf.php
install/dist/conf/debian60.conf.php
+1
-0
install/dist/conf/fedora9.conf.php
install/dist/conf/fedora9.conf.php
+1
-0
install/dist/conf/gentoo.conf.php
install/dist/conf/gentoo.conf.php
+1
-0
install/dist/conf/opensuse110.conf.php
install/dist/conf/opensuse110.conf.php
+1
-0
install/dist/conf/opensuse112.conf.php
install/dist/conf/opensuse112.conf.php
+1
-0
install/dist/lib/centos52.lib.php
install/dist/lib/centos52.lib.php
+73
-0
install/dist/lib/centos53.lib.php
install/dist/lib/centos53.lib.php
+73
-0
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+85
-0
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+11
-5
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+95
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+12
-5
install/lib/update.lib.php
install/lib/update.lib.php
+1
-0
install/sql/incremental/upd_0048.sql
install/sql/incremental/upd_0048.sql
+1
-0
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+1
-1
install/tpl/apache_apps_fcgi_starter.master
install/tpl/apache_apps_fcgi_starter.master
+2
-2
install/tpl/apache_ispconfig_fcgi_starter.master
install/tpl/apache_ispconfig_fcgi_starter.master
+2
-2
interface/lib/classes/aps_crawler.inc.php
interface/lib/classes/aps_crawler.inc.php
+50
-17
interface/lib/classes/aps_guicontroller.inc.php
interface/lib/classes/aps_guicontroller.inc.php
+8
-2
interface/lib/classes/ispcmail.inc.php
interface/lib/classes/ispcmail.inc.php
+2
-1
interface/lib/classes/simplepie.inc.php
interface/lib/classes/simplepie.inc.php
+7
-7
interface/lib/lang/ar.lng
interface/lib/lang/ar.lng
+1
-0
interface/lib/lang/bg.lng
interface/lib/lang/bg.lng
+1
-0
interface/lib/lang/br.lng
interface/lib/lang/br.lng
+1
-0
interface/lib/lang/cz.lng
interface/lib/lang/cz.lng
+1
-1
interface/lib/lang/de.lng
interface/lib/lang/de.lng
+43
-42
interface/lib/lang/el.lng
interface/lib/lang/el.lng
+1
-0
interface/lib/lang/es.lng
interface/lib/lang/es.lng
+1
-0
interface/lib/lang/fi.lng
interface/lib/lang/fi.lng
+1
-0
interface/lib/lang/fr.lng
interface/lib/lang/fr.lng
+1
-0
interface/lib/lang/hr.lng
interface/lib/lang/hr.lng
+1
-0
interface/lib/lang/hu.lng
interface/lib/lang/hu.lng
+1
-0
interface/lib/lang/id.lng
interface/lib/lang/id.lng
+1
-0
interface/lib/lang/it.lng
interface/lib/lang/it.lng
+1
-0
interface/lib/lang/ja.lng
interface/lib/lang/ja.lng
+1
-0
interface/lib/lang/nl.lng
interface/lib/lang/nl.lng
+1
-0
interface/lib/lang/pl.lng
interface/lib/lang/pl.lng
+1
-0
interface/lib/lang/pt.lng
interface/lib/lang/pt.lng
+1
-0
interface/lib/lang/ro.lng
interface/lib/lang/ro.lng
+1
-0
interface/lib/lang/ru.lng
interface/lib/lang/ru.lng
+1
-0
interface/lib/lang/se.lng
interface/lib/lang/se.lng
+1
-0
interface/lib/lang/sk.lng
interface/lib/lang/sk.lng
+1
-0
interface/lib/lang/tr.lng
interface/lib/lang/tr.lng
+1
-0
interface/web/admin/lib/lang/ar_login_as.lng
interface/web/admin/lib/lang/ar_login_as.lng
+10
-11
interface/web/admin/lib/lang/ar_system_config.lng
interface/web/admin/lib/lang/ar_system_config.lng
+3
-0
interface/web/admin/lib/lang/bg_login_as.lng
interface/web/admin/lib/lang/bg_login_as.lng
+10
-11
interface/web/admin/lib/lang/bg_system_config.lng
interface/web/admin/lib/lang/bg_system_config.lng
+3
-0
interface/web/admin/lib/lang/br_login_as.lng
interface/web/admin/lib/lang/br_login_as.lng
+10
-11
interface/web/admin/lib/lang/br_system_config.lng
interface/web/admin/lib/lang/br_system_config.lng
+3
-0
interface/web/admin/lib/lang/cz.lng
interface/web/admin/lib/lang/cz.lng
+0
-1
interface/web/admin/lib/lang/cz_directive_snippets.lng
interface/web/admin/lib/lang/cz_directive_snippets.lng
+0
-1
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+0
-1
interface/web/admin/lib/lang/cz_firewall.lng
interface/web/admin/lib/lang/cz_firewall.lng
+0
-1
interface/web/admin/lib/lang/cz_firewall_list.lng
interface/web/admin/lib/lang/cz_firewall_list.lng
+0
-1
interface/web/admin/lib/lang/cz_groups.lng
interface/web/admin/lib/lang/cz_groups.lng
+0
-1
interface/web/admin/lib/lang/cz_groups_list.lng
interface/web/admin/lib/lang/cz_groups_list.lng
+0
-1
interface/web/admin/lib/lang/cz_iptables.lng
interface/web/admin/lib/lang/cz_iptables.lng
+0
-1
interface/web/admin/lib/lang/cz_iptables_list.lng
interface/web/admin/lib/lang/cz_iptables_list.lng
+0
-1
interface/web/admin/lib/lang/cz_language_add.lng
interface/web/admin/lib/lang/cz_language_add.lng
+0
-1
interface/web/admin/lib/lang/cz_language_complete.lng
interface/web/admin/lib/lang/cz_language_complete.lng
+0
-1
interface/web/admin/lib/lang/cz_language_edit.lng
interface/web/admin/lib/lang/cz_language_edit.lng
+0
-1
interface/web/admin/lib/lang/cz_language_export.lng
interface/web/admin/lib/lang/cz_language_export.lng
+0
-1
interface/web/admin/lib/lang/cz_language_import.lng
interface/web/admin/lib/lang/cz_language_import.lng
+0
-1
interface/web/admin/lib/lang/cz_language_list.lng
interface/web/admin/lib/lang/cz_language_list.lng
+0
-1
interface/web/admin/lib/lang/cz_login_as.lng
interface/web/admin/lib/lang/cz_login_as.lng
+10
-11
interface/web/admin/lib/lang/cz_package_install.lng
interface/web/admin/lib/lang/cz_package_install.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_action.lng
interface/web/admin/lib/lang/cz_remote_action.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_user.lng
interface/web/admin/lib/lang/cz_remote_user.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_user_list.lng
interface/web/admin/lib/lang/cz_remote_user_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server.lng
interface/web/admin/lib/lang/cz_server.lng
+0
-1
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+0
-9
interface/web/admin/lib/lang/cz_server_config_list.lng
interface/web/admin/lib/lang/cz_server_config_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server_ip.lng
interface/web/admin/lib/lang/cz_server_ip.lng
+0
-1
No files found.
install/dist/conf/centos52.conf.php
View file @
526b997c
...
...
@@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/centos53.conf.php
View file @
526b997c
...
...
@@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/debian40.conf.php
View file @
526b997c
...
...
@@ -101,6 +101,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/cgi/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/debian60.conf.php
View file @
526b997c
...
...
@@ -101,6 +101,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/cgi/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/fedora9.conf.php
View file @
526b997c
...
...
@@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/gentoo.conf.php
View file @
526b997c
...
...
@@ -112,6 +112,7 @@ $conf['awstats']['buildstaticpages_pl'] = '/usr/bin/awstats_buildstaticpages.pl'
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php/cgi-php5'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/var/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/opensuse110.conf.php
View file @
526b997c
...
...
@@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/fastcgi/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/srv/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/conf/opensuse112.conf.php
View file @
526b997c
...
...
@@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/fastcgi/'
;
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
'/srv/www/php-fcgi-scripts/[system_user]/'
;
$conf
[
'fastcgi'
][
'fastcgi_bin'
]
=
'/usr/bin/php-cgi'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
...
...
install/dist/lib/centos52.lib.php
View file @
526b997c
...
...
@@ -30,6 +30,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
class
installer
extends
installer_dist
{
public
function
configure_mailman
(
$status
=
'insert'
)
{
global
$conf
;
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'mm_cfg.py'
;
//* Backup exiting file
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'mm_cfg.py~'
);
}
// load files
$content
=
rf
(
'tpl/mm_cfg.py.master'
);
$old_file
=
rf
(
$full_file_name
);
$old_options
=
array
();
$lines
=
explode
(
"
\n
"
,
$old_file
);
foreach
(
$lines
as
$line
)
{
if
(
trim
(
$line
)
!=
''
&&
substr
(
$line
,
0
,
1
)
!=
'#'
)
{
@
list
(
$key
,
$value
)
=
@
explode
(
"="
,
$line
);
if
(
!
empty
(
$value
))
{
$key
=
rtrim
(
$key
);
$old_options
[
$key
]
=
trim
(
$value
);
}
}
}
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'mailman'
);
chmod
(
$full_file_name
,
0750
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
{
// create virtual_domains list
$domainAll
=
$this
->
db
->
queryAllRecords
(
"SELECT domain FROM mail_mailinglist GROUP BY domain"
);
if
(
is_array
(
$domainAll
))
{
foreach
(
$domainAll
as
$domain
)
{
if
(
$domainAll
[
0
][
'domain'
]
==
$domain
[
'domain'
])
$virtual_domains
.
=
"'"
.
$domain
[
'domain'
]
.
"'"
;
else
$virtual_domains
.
=
", '"
.
$domain
[
'domain'
]
.
"'"
;
}
}
}
else
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
wf
(
$full_file_name
,
$content
);
}
public
function
configure_amavis
()
{
global
$conf
;
...
...
install/dist/lib/centos53.lib.php
View file @
526b997c
...
...
@@ -30,6 +30,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
class
installer
extends
installer_dist
{
public
function
configure_mailman
(
$status
=
'insert'
)
{
global
$conf
;
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'mm_cfg.py'
;
//* Backup exiting file
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'mm_cfg.py~'
);
}
// load files
$content
=
rf
(
'tpl/mm_cfg.py.master'
);
$old_file
=
rf
(
$full_file_name
);
$old_options
=
array
();
$lines
=
explode
(
"
\n
"
,
$old_file
);
foreach
(
$lines
as
$line
)
{
if
(
trim
(
$line
)
!=
''
&&
substr
(
$line
,
0
,
1
)
!=
'#'
)
{
@
list
(
$key
,
$value
)
=
@
explode
(
"="
,
$line
);
if
(
!
empty
(
$value
))
{
$key
=
rtrim
(
$key
);
$old_options
[
$key
]
=
trim
(
$value
);
}
}
}
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'mailman'
);
chmod
(
$full_file_name
,
0750
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
{
// create virtual_domains list
$domainAll
=
$this
->
db
->
queryAllRecords
(
"SELECT domain FROM mail_mailinglist GROUP BY domain"
);
if
(
is_array
(
$domainAll
))
{
foreach
(
$domainAll
as
$domain
)
{
if
(
$domainAll
[
0
][
'domain'
]
==
$domain
[
'domain'
])
$virtual_domains
.
=
"'"
.
$domain
[
'domain'
]
.
"'"
;
else
$virtual_domains
.
=
", '"
.
$domain
[
'domain'
]
.
"'"
;
}
}
}
else
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
wf
(
$full_file_name
,
$content
);
}
public
function
configure_amavis
()
{
global
$conf
;
...
...
install/dist/lib/fedora.lib.php
View file @
526b997c
...
...
@@ -29,6 +29,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class
installer_dist
extends
installer_base
{
public
function
configure_mailman
(
$status
=
'insert'
)
{
global
$conf
;
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'mm_cfg.py'
;
//* Backup exiting file
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'mm_cfg.py~'
);
}
// load files
$content
=
rf
(
'tpl/mm_cfg.py.master'
);
$old_file
=
rf
(
$full_file_name
);
$old_options
=
array
();
$lines
=
explode
(
"
\n
"
,
$old_file
);
foreach
(
$lines
as
$line
)
{
if
(
trim
(
$line
)
!=
''
&&
substr
(
$line
,
0
,
1
)
!=
'#'
)
{
@
list
(
$key
,
$value
)
=
@
explode
(
"="
,
$line
);
if
(
!
empty
(
$value
))
{
$key
=
rtrim
(
$key
);
$old_options
[
$key
]
=
trim
(
$value
);
}
}
}
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'mailman'
);
chmod
(
$full_file_name
,
0750
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
{
// create virtual_domains list
$domainAll
=
$this
->
db
->
queryAllRecords
(
"SELECT domain FROM mail_mailinglist GROUP BY domain"
);
if
(
is_array
(
$domainAll
))
{
foreach
(
$domainAll
as
$domain
)
{
if
(
$domainAll
[
0
][
'domain'
]
==
$domain
[
'domain'
])
$virtual_domains
.
=
"'"
.
$domain
[
'domain'
]
.
"'"
;
else
$virtual_domains
.
=
", '"
.
$domain
[
'domain'
]
.
"'"
;
}
}
}
else
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
wf
(
$full_file_name
,
$content
);
}
function
configure_postfix
(
$options
=
''
)
{
...
...
@@ -957,6 +1030,7 @@ class installer_dist extends installer_base {
exec
(
"ln -s
$vhost_conf_dir
/ispconfig.vhost
$vhost_conf_enabled_dir
/000-ispconfig.vhost"
);
}
/*
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
...
...
@@ -964,6 +1038,17 @@ class installer_dist extends installer_base {
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
*/
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
exec
(
'mkdir -p /var/www/php-fcgi-scripts/ispconfig'
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
exec
(
'ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
}
}
...
...
install/dist/lib/gentoo.lib.php
View file @
526b997c
...
...
@@ -612,8 +612,12 @@ class installer extends installer_base
if
(
!
is_file
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
)
)
{
$content
=
rf
(
'tpl/apache_apps_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps'
,
0755
,
true
);
copy
(
'tpl/apache_apps_fcgi_starter.master'
,
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
);
//copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
wf
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
);
exec
(
'chown -R ispapps:ispapps '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps'
);
...
...
@@ -938,13 +942,15 @@ class installer extends installer_base
$vhost_path
=
$conf
[
'apache'
][
'vhost_conf_dir'
]
.
'/ispconfig.vhost'
;
$this
->
write_config_file
(
$vhost_path
,
$content
);
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
copy
(
'tpl/apache_ispconfig_fcgi_starter.master'
,
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
chmod
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
0755
);
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
}
...
...
install/dist/lib/opensuse.lib.php
View file @
526b997c
...
...
@@ -29,6 +29,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class
installer_dist
extends
installer_base
{
public
function
configure_mailman
(
$status
=
'insert'
)
{
global
$conf
;
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'mm_cfg.py'
;
//* Backup exiting file
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'mm_cfg.py~'
);
}
// load files
$content
=
rf
(
'tpl/mm_cfg.py.master'
);
$old_file
=
rf
(
$full_file_name
);
$old_options
=
array
();
$lines
=
explode
(
"
\n
"
,
$old_file
);
foreach
(
$lines
as
$line
)
{
if
(
trim
(
$line
)
!=
''
&&
substr
(
$line
,
0
,
1
)
!=
'#'
)
{
@
list
(
$key
,
$value
)
=
@
explode
(
"="
,
$line
);
if
(
!
empty
(
$value
))
{
$key
=
rtrim
(
$key
);
$old_options
[
$key
]
=
trim
(
$value
);
}
}
}
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'mailman'
);
chmod
(
$full_file_name
,
0750
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
{
// create virtual_domains list
$domainAll
=
$this
->
db
->
queryAllRecords
(
"SELECT domain FROM mail_mailinglist GROUP BY domain"
);
if
(
is_array
(
$domainAll
))
{
foreach
(
$domainAll
as
$domain
)
{
if
(
$domainAll
[
0
][
'domain'
]
==
$domain
[
'domain'
])
$virtual_domains
.
=
"'"
.
$domain
[
'domain'
]
.
"'"
;
else
$virtual_domains
.
=
", '"
.
$domain
[
'domain'
]
.
"'"
;
}
}
}
else
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
wf
(
$full_file_name
,
$content
);
}
function
configure_postfix
(
$options
=
''
)
{
...
...
@@ -607,6 +680,24 @@ class installer_dist extends installer_base {
$command
=
'groupadd sshusers'
;
if
(
!
is_group
(
'sshusers'
))
caselog
(
$command
.
' &> /dev/null 2> /dev/null'
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
// create PHP-FPM pool dir
exec
(
'mkdir -p '
.
$conf
[
'nginx'
][
'php_fpm_pool_dir'
]);
$content
=
rf
(
'/etc/php5/fpm/php-fpm.conf'
);
if
(
stripos
(
$content
,
'include=/etc/php5/fpm/pool.d/*.conf'
)
===
false
){
af
(
'/etc/php5/fpm/php-fpm.conf'
,
"
\n
include=/etc/php5/fpm/pool.d/*.conf"
);
}
unset
(
$content
);
if
(
!@
is_file
(
$conf
[
'nginx'
][
'php_fpm_ini_path'
])){
if
(
@
is_file
(
'/etc/php5/cli/php.ini'
)){
exec
(
'cp -f /etc/php5/cli/php.ini '
.
$conf
[
'nginx'
][
'php_fpm_ini_path'
]);
}
elseif
(
@
is_file
(
'/etc/php5/fastcgi/php.ini'
)){
exec
(
'cp -f /etc/php5/fastcgi/php.ini '
.
$conf
[
'nginx'
][
'php_fpm_ini_path'
]);
}
elseif
(
@
is_file
(
'/etc/php5/apache2/php.ini'
)){
exec
(
'cp -f /etc/php5/apache2/php.ini '
.
$conf
[
'nginx'
][
'php_fpm_ini_path'
]);
}
}
}
public
function
configure_nginx
(){
...
...
@@ -988,8 +1079,11 @@ class installer_dist extends installer_base {
wf
(
"
$vhost_conf_dir
/ispconfig.vhost"
,
$content
);
if
(
!
is_file
(
'/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
exec
(
'mkdir -p /srv/www/php-fcgi-scripts/ispconfig'
);
exec
(
'cp tpl/apache_ispconfig_fcgi_starter.master
/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
wf
(
'
/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
exec
(
'ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig'
);
...
...
install/lib/installer_base.lib.php
View file @
526b997c
...
...
@@ -215,6 +215,7 @@ class installer_base {
$tpl_ini_array
[
'jailkit'
][
'jailkit_chroot_app_programs'
]
=
$conf
[
'jailkit'
][
'jailkit_chroot_app_programs'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_bin'
]
=
$conf
[
'fastcgi'
][
'fastcgi_bin'
];
$tpl_ini_array
[
'server'
][
'hostname'
]
=
$conf
[
'hostname'
];
$tpl_ini_array
[
'server'
][
'ip_address'
]
=
@
gethostbyname
(
$conf
[
'hostname'
]);
$tpl_ini_array
[
'web'
][
'website_basedir'
]
=
$conf
[
'web'
][
'website_basedir'
];
...
...
@@ -582,7 +583,7 @@ class installer_base {
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases'
);
exec
(
'/usr/lib/mailman/bin/genaliases
2>/dev/null
'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
...
...
@@ -1521,12 +1522,16 @@ class installer_base {
}
if
(
!
is_file
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
))
{
$content
=
rf
(
'tpl/apache_apps_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps'
,
0755
,
true
);
copy
(
'tpl/apache_apps_fcgi_starter.master'
,
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
);
//copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
wf
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
);
exec
(
'chown -R ispapps:ispapps '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps'
);
}
}
}
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
){
$apps_vhost_user
=
escapeshellcmd
(
$conf
[
'web'
][
'apps_vhost_user'
]);
...
...
@@ -1917,12 +1922,14 @@ class installer_base {
}
}
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
copy
(
'tpl/apache_ispconfig_fcgi_starter.master'
,
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
}
...
...
install/lib/update.lib.php
View file @
526b997c
...
...
@@ -247,6 +247,7 @@ function updateDbAndIni() {
$tpl_ini_array
[
'jailkit'
][
'jailkit_chroot_app_programs'
]
=
$conf
[
'jailkit'
][
'jailkit_chroot_app_programs'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_starter_path'
]
=
$conf
[
'fastcgi'
][
'fastcgi_starter_path'
];
$tpl_ini_array
[
'fastcgi'
][
'fastcgi_bin'
]
=
$conf
[
'fastcgi'
][
'fastcgi_bin'
];
$tpl_ini_array
[
'server'
][
'hostname'
]
=
$conf
[
'hostname'
];
$tpl_ini_array
[
'server'
][
'ip_address'
]
=
@
gethostbyname
(
$conf
[
'hostname'
]);
$tpl_ini_array
[
'web'
][
'website_basedir'
]
=
$conf
[
'web'
][
'website_basedir'
];
...
...
install/sql/incremental/upd_0048.sql
0 → 100644
View file @
526b997c
ALTER
TABLE
`client`
CHANGE
`limit_aps`
`limit_aps`
INT
(
11
)
NOT
NULL
DEFAULT
'-1'
;
\ No newline at end of file
install/sql/ispconfig3.sql
View file @
526b997c
...
...
@@ -201,7 +201,7 @@ CREATE TABLE `client` (
`limit_shell_user`
int
(
11
)
NOT
NULL
DEFAULT
'0'
,
`ssh_chroot`
varchar
(
255
)
NOT
NULL
DEFAULT
'no,jailkit,ssh-chroot'
,
`limit_webdav_user`
int
(
11
)
NOT
NULL
DEFAULT
'0'
,
`limit_aps`
int
(
11
)
NOT
NULL
DEFAULT
'
0
'
,
`limit_aps`
int
(
11
)
NOT
NULL
DEFAULT
'
-1
'
,
`default_dnsserver`
int
(
11
)
unsigned
NOT
NULL
DEFAULT
'1'
,
`limit_dns_zone`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`limit_dns_slave_zone`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
...
...
install/tpl/apache_apps_fcgi_starter.master
View file @
526b997c
#!/bin/sh
PHPRC
=
/etc/php5/cgi/
PHPRC
=
{
fastcgi_phpini_path
}
export
PHPRC
export
PHP_FCGI_MAX_REQUESTS
=
5000
export
PHP_FCGI_CHILDREN
=
1
exec
/usr/lib/cgi-bin/php
-d
magic_quotes_gpc
=
off
\ No newline at end of file