Skip to content
GitLab
Explore
Sign in
Register
ISPConfig
ISPConfig 3
Compare revisions
3728238b417150c1885a9ce1ab8d7e061d3bbe3e to b0012a0ada603c06cd468725956aa215f7be190c
Commits on Source (2)
Avoid two warnings about ufw not being set
· bae7cc60
Helmo
authored
Apr 11, 2024
bae7cc60
Merge branch 'php-ufw' into 'develop'
· b0012a0a
Till Brehm
authored
Apr 12, 2024
Avoid two warnings about ufw not being set See merge request
!1880
b0012a0a
Hide whitespace changes
Inline
Side-by-side
install/install.php
View file @
b0012a0a
...
...
@@ -664,7 +664,7 @@ if($conf['powerdns']['installed'] == true && isset($conf['powerdns']['init_scrip
if
(
$conf
[
'bind'
][
'installed'
]
==
true
&&
isset
(
$conf
[
'bind'
][
'init_script'
])
&&
$conf
[
'bind'
][
'init_script'
]
!=
''
)
system
(
$inst
->
getinitcommand
(
$conf
[
'bind'
][
'init_script'
],
'restart'
)
.
' &> /dev/null'
);
//if($conf['squid']['installed'] == true && isset($conf['squid']['init_script']) && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
&&
isset
(
$conf
[
'nginx'
][
'init_script'
])
&&
$conf
[
'nginx'
][
'init_script'
]
!=
''
)
system
(
$inst
->
getinitcommand
(
$conf
[
'nginx'
][
'init_script'
],
'restart'
)
.
' &> /dev/null'
);
if
(
$conf
[
'ufw'
][
'installed'
]
==
true
&&
isset
(
$conf
[
'ufw'
][
'init_script'
])
&&
$conf
[
'ufw'
][
'init_script'
]
!=
''
)
system
(
$inst
->
getinitcommand
(
$conf
[
'ufw'
][
'init_script'
],
'restart'
)
.
' &> /dev/null'
);
if
(
isset
(
$conf
[
'ufw'
][
'installed'
])
&&
$conf
[
'ufw'
][
'installed'
]
==
true
&&
isset
(
$conf
[
'ufw'
][
'init_script'
])
&&
$conf
[
'ufw'
][
'init_script'
]
!=
''
)
system
(
$inst
->
getinitcommand
(
$conf
[
'ufw'
][
'init_script'
],
'restart'
)
.
' &> /dev/null'
);
if
(
$conf
[
'xmpp'
][
'installed'
]
==
true
&&
isset
(
$conf
[
'xmpp'
][
'init_script'
])
&&
$conf
[
'xmpp'
][
'init_script'
]
!=
''
)
system
(
$inst
->
getinitcommand
(
$conf
[
'xmpp'
][
'init_script'
],
'restart'
)
.
' &> /dev/null'
);
...
...
install/lib/installer_base.lib.php
View file @
b0012a0a
...
...
@@ -436,7 +436,7 @@ class installer_base extends stdClass {
$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
[
'server'
][
'firewall'
]
=
(
$conf
[
'ufw'
][
'installed'
]
==
true
)
?
'ufw'
:
'bastille'
;
$tpl_ini_array
[
'server'
][
'firewall'
]
=
(
@
$conf
[
'ufw'
][
'installed'
]
==
true
)
?
'ufw'
:
'bastille'
;
$tpl_ini_array
[
'web'
][
'website_basedir'
]
=
$conf
[
'web'
][
'website_basedir'
];
$tpl_ini_array
[
'web'
][
'website_path'
]
=
$conf
[
'web'
][
'website_path'
];
$tpl_ini_array
[
'web'
][
'website_symlinks'
]
=
$conf
[
'web'
][
'website_symlinks'
];
...
...