Set file mode explicitly for rspamd worker-controller.inc config file to not rely on system umask.

Till Brehm · Till Brehm · commit f2ec8695499c · 2019-09-11T12:25:37.000+02:00
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1644,7 +1644,8 @@ public function configure_rspamd() {
 		$tpl = new tpl();
 		$tpl->newTemplate('rspamd_worker-controller.inc.master');
 		$tpl->setVar('rspamd_password', $mail_config['rspamd_password']);
-		wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());		
+		wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());
+		chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);
 	}
 
 	public function configure_spamassassin() {
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -242,6 +242,7 @@ function update($event_name, $data) {
 			$tpl->newTemplate('rspamd_worker-controller.inc.master');
 			$tpl->setVar('rspamd_password', $rspamd_password);
 			$app->system->file_put_contents('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());
+			chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);
 			$app->services->restartServiceDelayed('rspamd', 'reload');
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,8 @@ public function configure_rspamd() {`
`1644`	`1644`	`$tpl = new tpl();`
`1645`	`1645`	`$tpl->newTemplate('rspamd_worker-controller.inc.master');`
`1646`	`1646`	`$tpl->setVar('rspamd_password', $mail_config['rspamd_password']);`
`1647`		`- wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());`
	`1647`	`+ wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());`
	`1648`	`+ chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);`
`1648`	`1649`	`}`
`1649`	`1650`
`1650`	`1651`	`public function configure_spamassassin() {`
Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,7 @@ function update($event_name, $data) {`
`242`	`242`	`$tpl->newTemplate('rspamd_worker-controller.inc.master');`
`243`	`243`	`$tpl->setVar('rspamd_password', $rspamd_password);`
`244`	`244`	`$app->system->file_put_contents('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());`
	`245`	`+ chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);`
`245`	`246`	`$app->services->restartServiceDelayed('rspamd', 'reload');`
`246`	`247`	`}`
`247`	`248`