Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
485
Issues
485
List
Boards
Labels
Service Desk
Milestones
Merge Requests
23
Merge Requests
23
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
0f76ebb7
Commit
0f76ebb7
authored
Mar 05, 2009
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made fastcgi php.ini path configurable per linux distribution.
parent
9482455f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
2 deletions
+17
-2
install/dist/conf/centos52.conf.php
install/dist/conf/centos52.conf.php
+4
-0
install/dist/conf/debian40.conf.php
install/dist/conf/debian40.conf.php
+3
-0
install/dist/conf/fedora9.conf.php
install/dist/conf/fedora9.conf.php
+3
-0
install/dist/conf/opensuse110.conf.php
install/dist/conf/opensuse110.conf.php
+3
-0
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+2
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+2
-1
No files found.
install/dist/conf/centos52.conf.php
View file @
0f76ebb7
...
...
@@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available';
$conf
[
'apache'
][
'vhost_conf_enabled_dir'
]
=
'/etc/httpd/conf/sites-enabled'
;
$conf
[
'apache'
][
'vhost_port'
]
=
'8080'
;
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
$conf
[
'postfix'
][
'config_dir'
]
=
'/etc/postfix'
;
...
...
@@ -139,4 +142,5 @@ $conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf
[
'jailkit'
][
'jk_chrootsh'
]
=
'jk_chrootsh.ini'
;
$conf
[
'jailkit'
][
'jailkit_chroot_app_programs'
]
=
'/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano'
;
?>
\ No newline at end of file
install/dist/conf/debian40.conf.php
View file @
0f76ebb7
...
...
@@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
$conf
[
'apache'
][
'vhost_conf_enabled_dir'
]
=
'/etc/apache2/sites-enabled'
;
$conf
[
'apache'
][
'vhost_port'
]
=
'8080'
;
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/cgi/'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
$conf
[
'postfix'
][
'config_dir'
]
=
'/etc/postfix'
;
...
...
install/dist/conf/fedora9.conf.php
View file @
0f76ebb7
...
...
@@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available';
$conf
[
'apache'
][
'vhost_conf_enabled_dir'
]
=
'/etc/httpd/conf/sites-enabled'
;
$conf
[
'apache'
][
'vhost_port'
]
=
'8080'
;
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
$conf
[
'postfix'
][
'config_dir'
]
=
'/etc/postfix'
;
...
...
install/dist/conf/opensuse110.conf.php
View file @
0f76ebb7
...
...
@@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
$conf
[
'apache'
][
'vhost_conf_enabled_dir'
]
=
'/etc/apache2/sites-enabled'
;
$conf
[
'apache'
][
'vhost_port'
]
=
'8080'
;
//* Fastcgi
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
]
=
'/etc/php5/cgi/'
;
//* Postfix
$conf
[
'postfix'
][
'installed'
]
=
false
;
// will be detected automatically during installation
$conf
[
'postfix'
][
'config_dir'
]
=
'/etc/postfix'
;
...
...
install/dist/lib/fedora.lib.php
View file @
0f76ebb7
...
...
@@ -681,7 +681,6 @@ class installer_dist extends installer_base {
// Dont just copy over the virtualhost template but add some custom settings
$content
=
rf
(
"tpl/apache_ispconfig.vhost.master"
);
$content
=
str_replace
(
'{vhost_port}'
,
$conf
[
'apache'
][
'vhost_port'
],
$content
);
...
...
@@ -708,6 +707,8 @@ class installer_dist extends installer_base {
exec
(
'ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'
);
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
);
}
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
...
...
install/lib/installer_base.lib.php
View file @
0f76ebb7
...
...
@@ -202,7 +202,8 @@ class installer_base {
// TODO: Update further distribution specific parameters for server config here
$tpl_ini_array
[
'web'
][
'vhost_conf_dir'
]
=
$conf
[
'apache'
][
'vhost_conf_dir'
];
$tpl_ini_array
[
'web'
][
'vhost_conf_enabled_dir'
]
=
$conf
[
'apache'
][
'vhost_conf_enabled_dir'
];
$tpl_ini_array
[
'web'
][
'jailkit_chroot_app_programs'
]
=
$conf
[
'jailkit'
][
'jailkit_chroot_app_programs'
];
$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'
];
$server_ini_content
=
array_to_ini
(
$tpl_ini_array
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment