aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-05-05 11:51:17 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-05-05 17:19:09 -0300
commit616b3aa210d815399191c59a70d46512f861d431 (patch)
tree99080b15f6fae5255f5ce14506b54f29663b6b26
parentf7467fdc76c95b4d26fa524bd154b2e4d3fc029b (diff)
downloadpfsense-packages-616b3aa210d815399191c59a70d46512f861d431.tar.gz
pfsense-packages-616b3aa210d815399191c59a70d46512f861d431.tar.bz2
pfsense-packages-616b3aa210d815399191c59a70d46512f861d431.zip
Replace all calls to make_dirs() by mkdir with mode 0755 and recursive enabled
-rw-r--r--config/haproxy-devel/pkg/haproxy.inc6
-rw-r--r--config/haproxy1_5/pkg/haproxy.inc6
-rw-r--r--config/squid/squid.inc8
-rw-r--r--config/squid3/31/squid.inc10
-rwxr-xr-xconfig/squid3/33/squid.inc12
-rwxr-xr-xconfig/squid3/34/squid.inc14
-rw-r--r--config/stunnel/stunnel.inc2
7 files changed, 29 insertions, 29 deletions
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index f8aab3b1..1e0b28f4 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -909,12 +909,12 @@ function haproxy_writeconf($configpath) {
if (!isset($aliastable))
alias_make_table($config);
$chroot_dir = "/tmp/haproxy_chroot"; // can contain socket to forward connection from backend to frontend. "/var/empty"
- make_dirs($chroot_dir);
+ @mkdir($chroot_dir, 0755, true);
$configfile = $configpath . "/haproxy.cfg";
rmdir_recursive($configpath);
- make_dirs($configpath);
+ @mkdir($configpath, 0755, true);
$a_global = &$config['installedpackages']['haproxy'];
$a_frontends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
@@ -1004,7 +1004,7 @@ function haproxy_writeconf($configpath) {
$certs = $frontend['ha_certificates']['item'];
if (is_array($certs)){
if (count($certs) > 0){
- make_dirs($subfolder);
+ @mkdir($subfolder, 0755, true);
foreach($certs as $cert){
haproxy_write_certificate_fullchain("$subfolder/{$cert['ssl_certificate']}.pem", $cert['ssl_certificate']);
}
diff --git a/config/haproxy1_5/pkg/haproxy.inc b/config/haproxy1_5/pkg/haproxy.inc
index 135f2d4f..793c5c28 100644
--- a/config/haproxy1_5/pkg/haproxy.inc
+++ b/config/haproxy1_5/pkg/haproxy.inc
@@ -903,12 +903,12 @@ function haproxy_writeconf($configpath) {
if (!isset($aliastable))
alias_make_table($config);
$chroot_dir = "/tmp/haproxy_chroot"; // can contain socket to forward connection from backend to frontend. "/var/empty"
- make_dirs($chroot_dir);
+ @mkdir($chroot_dir, 0755, true);
$configfile = $configpath . "/haproxy.cfg";
rmdir_recursive($configpath);
- make_dirs($configpath);
+ @mkdir($configpath, 0755, true);
$a_global = &$config['installedpackages']['haproxy'];
$a_frontends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
@@ -998,7 +998,7 @@ function haproxy_writeconf($configpath) {
$certs = $frontend['ha_certificates']['item'];
if (is_array($certs)){
if (count($certs) > 0){
- make_dirs($subfolder);
+ @mkdir($subfolder, 0755, true);
foreach($certs as $cert){
haproxy_write_certificate_fullchain("$subfolder/{$cert['ssl_certificate']}.pem", $cert['ssl_certificate']);
}
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 0ddd1645..8e87c7a1 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -94,7 +94,7 @@ function squid_dash_z() {
if(!is_dir($cachedir.'/')) {
log_error("Creating Squid cache dir $cachedir");
- make_dirs($cachedir);
+ @mkdir($cachedir, 0755, true);
// Double check permissions here, should be safe to recurse cache dir if it's small here.
mwexec("/usr/sbin/chown -R proxy:proxy $cachedir");
}
@@ -223,7 +223,7 @@ function squid_install_command() {
foreach (array( SQUID_CONFBASE,
SQUID_ACLDIR,
SQUID_BASE ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
squid_chown_recursive($dir, 'proxy', 'proxy');
}
@@ -1153,7 +1153,7 @@ function squid_resync() {
foreach (array( SQUID_CONFBASE,
SQUID_ACLDIR,
SQUID_BASE ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
squid_chown_recursive($dir, 'proxy', 'proxy');
}
@@ -1163,7 +1163,7 @@ function squid_resync() {
if(!is_dir($log_dir)) {
log_error("Creating squid log dir $log_dir");
- make_dirs($log_dir);
+ @mkdir($log_dir, 0755, true);
squid_chown_recursive($log_dir, 'proxy', 'proxy');
}
diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc
index ef346e1a..e6de88c4 100644
--- a/config/squid3/31/squid.inc
+++ b/config/squid3/31/squid.inc
@@ -112,7 +112,7 @@ function squid_dash_z() {
if(!is_dir($cachedir.'/')) {
log_error("Creating Squid cache dir $cachedir");
- make_dirs($cachedir);
+ @mkdir($cachedir, 0755, true);
// Double check permissions here, should be safe to recurse cache dir if it's small here.
mwexec("/usr/sbin/chown -R proxy:proxy $cachedir");
}
@@ -307,7 +307,7 @@ function squid_install_command() {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
squid_chown_recursive($dir, 'proxy', 'proxy');
}
@@ -806,7 +806,7 @@ function squid_resync_general() {
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
if (! is_dir($logdir)){
- make_dirs($logdir);
+ @mkdir($logdir, 0755, true);
squid_chown_recursive($logdir, 'proxy', 'proxy');
}
$logdir_cache = $logdir . '/cache.log';
@@ -1445,7 +1445,7 @@ function squid_resync() {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
chown($dir, 'proxy');
chgrp($dir, 'proxy');
squid_chown_recursive($dir, 'proxy', 'proxy');
@@ -1486,7 +1486,7 @@ function squid_resync() {
if ($log_dir != ""){
if(!is_dir($log_dir)) {
log_error("Creating squid log dir $log_dir");
- make_dirs($log_dir);
+ @mkdir($log_dir, 0755, true);
squid_chown_recursive($log_dir, 'proxy', 'proxy');
}
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index d9bb1549..669ae2f3 100755
--- a/config/squid3/33/squid.inc
+++ b/config/squid3/33/squid.inc
@@ -127,7 +127,7 @@ function squid_dash_z($cache_action='none') {
if(!is_dir($cachedir.'/')) {
log_error("Creating Squid cache dir $cachedir");
- make_dirs($cachedir);
+ @mkdir($cachedir, 0755, true);
// Double check permissions here, should be safe to recurse cache dir if it's small here.
mwexec("/usr/sbin/chown -R proxy:proxy $cachedir");
}
@@ -324,7 +324,7 @@ function squid_install_command() {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
squid_chown_recursive($dir, 'proxy', 'proxy');
}
@@ -946,7 +946,7 @@ function squid_resync_general() {
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
if (! is_dir($logdir)){
- make_dirs($logdir);
+ @mkdir($logdir, 0755, true);
squid_chown_recursive($logdir, 'proxy', 'proxy');
}
$logdir_cache = $logdir . '/cache.log';
@@ -1430,7 +1430,7 @@ EOF;
"/var/db/clamav" => "clamav");
foreach ($dirs as $dir_path => $dir_user){
if (!is_dir($dir_path))
- make_dirs($dir_path);
+ @mkdir($dir_path, 0755, true);
squid_chown_recursive($dir_path, $dir_user, "wheel");
}
#Check clamav database
@@ -1844,7 +1844,7 @@ function squid_resync($via_rpc="no") {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
chown($dir, 'proxy');
chgrp($dir, 'proxy');
squid_chown_recursive($dir, 'proxy', 'proxy');
@@ -1886,7 +1886,7 @@ function squid_resync($via_rpc="no") {
if ($log_dir != ""){
if(!is_dir($log_dir)) {
log_error("Creating squid log dir $log_dir");
- make_dirs($log_dir);
+ @mkdir($log_dir, 0755, true);
squid_chown_recursive($log_dir, 'proxy', 'proxy');
}
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index 4b8d596f..e2b95adb 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -132,7 +132,7 @@ function squid_dash_z($cache_action='none') {
if (!is_dir($cachedir.'/')) {
log_error("Creating Squid cache dir {$cachedir}");
- make_dirs($cachedir);
+ @mkdir($cachedir, 0755, true);
// Double check permissions here, should be safe to recurse cache dir if it's small here.
mwexec("/usr/sbin/chown -R proxy:proxy $cachedir");
}
@@ -324,7 +324,7 @@ function squid_install_command() {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
squid_chown_recursive($dir, 'proxy', 'proxy');
}
@@ -982,7 +982,7 @@ function squid_resync_general() {
$piddir="{$g['varrun_path']}/squid";
$pidfile = "{$piddir}/squid.pid";
if (!is_dir($piddir)) {
- make_dirs($piddir);
+ @mkdir($piddir, 0755, true);
squid_chown_recursive($piddir, 'proxy', 'wheel');
}
$language = ($settings['error_language'] ? $settings['error_language'] : 'en');
@@ -992,7 +992,7 @@ function squid_resync_general() {
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
if (!is_dir($logdir)) {
- make_dirs($logdir);
+ @mkdir($logdir, 0755, true);
squid_chown_recursive($logdir, 'proxy', 'proxy');
}
$logdir_cache = $logdir . '/cache.log';
@@ -1466,7 +1466,7 @@ EOF;
);
foreach ($dirs as $dir_path => $dir_user) {
if (!is_dir($dir_path))
- make_dirs($dir_path);
+ @mkdir($dir_path, 0755, true);
squid_chown_recursive($dir_path, $dir_user, "wheel");
}
// Check clamav database
@@ -1890,7 +1890,7 @@ function squid_resync($via_rpc="no") {
SQUID_BASE,
SQUID_LIB,
SQUID_SSL_DB ) as $dir) {
- make_dirs($dir);
+ @mkdir($dir, 0755, true);
chown($dir, 'proxy');
chgrp($dir, 'proxy');
squid_chown_recursive($dir, 'proxy', 'proxy');
@@ -1932,7 +1932,7 @@ function squid_resync($via_rpc="no") {
if ($log_dir != "") {
if (!is_dir($log_dir)) {
log_error("Creating squid log dir $log_dir");
- make_dirs($log_dir);
+ @mkdir($log_dir, 0755, true);
squid_chown_recursive($log_dir, 'proxy', 'proxy');
}
diff --git a/config/stunnel/stunnel.inc b/config/stunnel/stunnel.inc
index 571cfb01..fdc72bf2 100644
--- a/config/stunnel/stunnel.inc
+++ b/config/stunnel/stunnel.inc
@@ -201,7 +201,7 @@ function stunnel_install() {
safe_mkdir("/usr/local/etc/stunnel");
system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
chmod("/usr/local/etc/stunnel/stunnel.pem", 0600);
- make_dirs("/var/tmp/stunnel/var/tmp/run/stunnel");
+ @mkdir("/var/tmp/stunnel/var/tmp/run/stunnel", 0755, true);
system("/usr/sbin/chown -R stunnel:stunnel /var/tmp/stunnel");
$_rcfile['file']='stunnel.sh';
$_rcfile['start'].="/usr/local/bin/stunnel /usr/local/etc/stunnel/stunnel.conf \n\t";