Skip to content

Commit fee7a4a

Browse files
committed
Fixed a bug with getmail script permissions.
1 parent 727e0dc commit fee7a4a

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,9 @@ public function install_ispconfig()
764764
if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
765765
if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
766766

767-
exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');
768-
exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');
767+
exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
768+
exec('chown getmail /usr/local/bin/run-getmail.sh');
769+
exec('chmod 744 /usr/local/bin/run-getmail.sh');
769770

770771

771772
}
@@ -827,7 +828,7 @@ public function install_crontab()
827828
$existing_cron_jobs = file('crontab.txt');
828829

829830
$cron_jobs = array(
830-
'*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
831+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
831832
);
832833

833834
// remove existing ispconfig cronjobs, in case the syntax has changed

install/dist/lib/opensuse.lib.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -782,8 +782,9 @@ public function install_ispconfig()
782782
if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
783783
if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
784784

785-
exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');
786-
exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');
785+
exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
786+
exec('chown getmail /usr/local/bin/run-getmail.sh');
787+
exec('chmod 744 /usr/local/bin/run-getmail.sh');
787788

788789

789790
}
@@ -845,7 +846,7 @@ public function install_crontab()
845846
$existing_cron_jobs = file('crontab.txt');
846847

847848
$cron_jobs = array(
848-
'*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
849+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
849850
);
850851

851852
// remove existing ispconfig cronjobs, in case the syntax has changed

install/lib/installer_base.lib.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,9 @@ public function install_ispconfig()
10521052
if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
10531053
if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
10541054

1055-
exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');
1056-
exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');
1055+
exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
1056+
exec('chown getmail /usr/local/bin/run-getmail.sh');
1057+
exec('chmod 744 /usr/local/bin/run-getmail.sh');
10571058

10581059

10591060
}
@@ -1115,7 +1116,7 @@ public function install_crontab()
11151116
$existing_cron_jobs = file('crontab.txt');
11161117

11171118
$cron_jobs = array(
1118-
'*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
1119+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
11191120
);
11201121

11211122
// remove existing ispconfig cronjobs, in case the syntax has changed

0 commit comments

Comments
 (0)