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
ISPConfig
ISPConfig 3
Commits
1dbd0e35
Commit
1dbd0e35
authored
Oct 19, 2015
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FS#2403 - Disable apps vhost in server config
parent
6495dda1
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
53 additions
and
0 deletions
+53
-0
install/tpl/server.ini.master
install/tpl/server.ini.master
+1
-0
interface/web/admin/form/server_config.tform.php
interface/web/admin/form/server_config.tform.php
+6
-0
interface/web/admin/lib/lang/ar_server_config.lng
interface/web/admin/lib/lang/ar_server_config.lng
+1
-0
interface/web/admin/lib/lang/bg_server_config.lng
interface/web/admin/lib/lang/bg_server_config.lng
+1
-0
interface/web/admin/lib/lang/br_server_config.lng
interface/web/admin/lib/lang/br_server_config.lng
+1
-0
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+1
-0
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/de_server_config.lng
+1
-0
interface/web/admin/lib/lang/el_server_config.lng
interface/web/admin/lib/lang/el_server_config.lng
+1
-0
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
+1
-0
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
+1
-0
interface/web/admin/lib/lang/fi_server_config.lng
interface/web/admin/lib/lang/fi_server_config.lng
+1
-0
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
+1
-0
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
+1
-0
interface/web/admin/lib/lang/hu_server_config.lng
interface/web/admin/lib/lang/hu_server_config.lng
+1
-0
interface/web/admin/lib/lang/id_server_config.lng
interface/web/admin/lib/lang/id_server_config.lng
+1
-0
interface/web/admin/lib/lang/it_server_config.lng
interface/web/admin/lib/lang/it_server_config.lng
+1
-0
interface/web/admin/lib/lang/ja_server_config.lng
interface/web/admin/lib/lang/ja_server_config.lng
+1
-0
interface/web/admin/lib/lang/nl_server_config.lng
interface/web/admin/lib/lang/nl_server_config.lng
+1
-0
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+1
-0
interface/web/admin/lib/lang/pt_server_config.lng
interface/web/admin/lib/lang/pt_server_config.lng
+1
-0
interface/web/admin/lib/lang/ro_server_config.lng
interface/web/admin/lib/lang/ro_server_config.lng
+1
-0
interface/web/admin/lib/lang/ru_server_config.lng
interface/web/admin/lib/lang/ru_server_config.lng
+1
-0
interface/web/admin/lib/lang/se_server_config.lng
interface/web/admin/lib/lang/se_server_config.lng
+1
-0
interface/web/admin/lib/lang/sk_server_config.lng
interface/web/admin/lib/lang/sk_server_config.lng
+1
-0
interface/web/admin/lib/lang/tr_server_config.lng
interface/web/admin/lib/lang/tr_server_config.lng
+1
-0
interface/web/admin/templates/server_config_web_edit.htm
interface/web/admin/templates/server_config_web_edit.htm
+3
-0
server/plugins-available/apps_vhost_plugin.inc.php
server/plugins-available/apps_vhost_plugin.inc.php
+20
-0
No files found.
install/tpl/server.ini.master
View file @
1dbd0e35
...
...
@@ -72,6 +72,7 @@ user=www-data
group=www-data
nginx_user=www-data
nginx_group=www-data
apps_vhost_enabled=y
apps_vhost_port=8081
apps_vhost_ip=_default_
apps_vhost_servername=
...
...
interface/web/admin/form/server_config.tform.php
View file @
1dbd0e35
...
...
@@ -1038,6 +1038,12 @@ $form["tabs"]['web'] = array(
1
=>
'y'
)
),
'apps_vhost_enabled'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'CHECKBOX'
,
'default'
=>
'y'
,
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
'apps_vhost_port'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
...
...
interface/web/admin/lib/lang/ar_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/bg_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/br_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/cz_server_config.lng
View file @
1dbd0e35
...
...
@@ -253,5 +253,6 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/de_server_config.lng
View file @
1dbd0e35
...
...
@@ -266,4 +266,5 @@ $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
$wb
[
'php_handler_txt'
]
=
'Standard-PHP-Handler'
;
$wb
[
'enable_spdy_txt'
]
=
'Stellt SPDY zur Verfügung'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/el_server_config.lng
View file @
1dbd0e35
...
...
@@ -250,4 +250,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/en_server_config.lng
View file @
1dbd0e35
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/es_server_config.lng
View file @
1dbd0e35
...
...
@@ -253,4 +253,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/fi_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/fr_server_config.lng
View file @
1dbd0e35
...
...
@@ -252,5 +252,6 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/hr_server_config.lng
View file @
1dbd0e35
...
...
@@ -256,6 +256,7 @@ $wb['crontab_dir_error_regex'] = 'Neispravan crontab direktorij.';
$wb
[
'cron_wget_error_regex'
]
=
'Neispravna cron wget putanja.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/hu_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/id_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/it_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/ja_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/nl_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/pl_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/pt_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/ro_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/ru_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/se_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/sk_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/lib/lang/tr_server_config.lng
View file @
1dbd0e35
...
...
@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb
[
'cron_wget_error_regex'
]
=
'Invalid cron wget path.'
;
$wb
[
'network_filesystem_txt'
]
=
'Network Filesystem'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
?>
interface/web/admin/templates/server_config_web_edit.htm
View file @
1dbd0e35
...
...
@@ -228,6 +228,9 @@
</div>
<div
class=
"col-sm-3"
></div><div
class=
"col-sm-9"
><button
class=
"btn btn-default formbutton-default"
type=
"button"
data-toggle=
"collapse"
data-target=
"#toggle-apps_vhost_settings"
aria-expanded=
"false"
aria-controls=
"toggle-apps_vhost_settings"
>
{tmpl_var name='apps_vhost_settings_txt'}
</button></div>
<div
id=
"toggle-apps_vhost_settings"
class=
"collapse"
>
<div
class=
"form-group"
>
<label
for=
"apps_vhost_enabled"
class=
"col-sm-3 control-label"
>
{tmpl_var name='apps_vhost_enabled_txt'}
</label>
<div
class=
"col-sm-9"
>
{tmpl_var name='apps_vhost_enabled'}
</div></div>
<div
class=
"form-group"
>
<label
for=
"apps_vhost_port"
class=
"col-sm-3 control-label"
>
{tmpl_var name='apps_vhost_port_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"apps_vhost_port"
id=
"apps_vhost_port"
value=
"{tmpl_var name='apps_vhost_port'}"
class=
"form-control"
/></div></div>
...
...
server/plugins-available/apps_vhost_plugin.inc.php
View file @
1dbd0e35
...
...
@@ -119,6 +119,16 @@ class apps_vhost_plugin {
/* end of backwards compatibility section */
$app
->
system
->
file_put_contents
(
"
$vhost_conf_dir
/apps.vhost"
,
$content
);
// enabled / disable apps-vhost
$vhost_symlink
=
escapeshellcmd
(
$web_config
[
'vhost_conf_enabled_dir'
]
.
'/000-apps.vhost'
);
if
(
is_link
(
$vhost_symlink
)
&&
$web_config
[
'apps_vhost_enabled'
]
==
'n'
)
{
$app
->
system
->
unlink
(
$vhost_symlink
);
}
if
(
!@
is_link
(
$vhost_conf_enabled_dir
.
'/000-apps.vhost'
)
&&
$web_config
[
'apps_vhost_enabled'
]
==
'y'
)
{
symlink
(
$vhost_conf_dir
.
'/apps.vhost'
,
$vhost_conf_enabled_dir
.
'/000-apps.vhost'
);
}
$app
->
services
->
restartServiceDelayed
(
'httpd'
,
'restart'
);
}
...
...
@@ -185,6 +195,16 @@ class apps_vhost_plugin {
file_put_contents
(
$web_config
[
'php_fpm_pool_dir'
]
.
'/apps.conf'
,
$fpm_content
);
file_put_contents
(
"
$vhost_conf_dir
/apps.vhost"
,
$content
);
// enabled / disable apps-vhost
$vhost_symlink
=
escapeshellcmd
(
$web_config
[
'vhost_conf_enabled_dir'
]
.
'/000-apps.vhost'
);
if
(
is_link
(
$vhost_symlink
)
&&
$web_config
[
'apps_vhost_enabled'
]
==
'n'
)
{
$app
->
system
->
unlink
(
$vhost_symlink
);
}
if
(
!@
is_link
(
$vhost_conf_enabled_dir
.
'/000-apps.vhost'
)
&&
$web_config
[
'apps_vhost_enabled'
]
==
'y'
)
{
symlink
(
$vhost_conf_dir
.
'/apps.vhost'
,
$vhost_conf_enabled_dir
.
'/000-apps.vhost'
);
}
$app
->
services
->
restartServiceDelayed
(
'httpd'
,
'reload'
);
}
}
...
...
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