Merge branch 'develop' into 'main'

Merging develop into main

See merge request !75

src/Handler.php

@@ -447,7 +447,11 @@ class Handler extends BaseHandler {
         if (empty($def['add2git'])) {
           $this->gitIgnore($filename);
         }
+        $fs->chmod($file, 0664);
         file_put_contents($file, $rendered);
+        if (empty($def['add2git'])) {
+          $fs->chmod($file, 0444);
+        }
       }
       if (isset($def['link']) && ($def['link'] !== $settingsPath)) {
         $link = $def['link'] . '/' . $filename;
@@ -465,7 +469,9 @@ class Handler extends BaseHandler {
       $settingsPhp = file_get_contents($settingsPhpFile);
       if (strpos($settingsPhp, 'settings.docker.php') === FALSE) {
         $settingsPhp .= "\n\nif (file_exists(__DIR__ . '/settings.docker.php')) {\n  include __DIR__ . '/settings.docker.php';\n}\n";
+        $fs->chmod($settingsPhpFile, 0664);
         file_put_contents($settingsPhpFile, $settingsPhp);
+        $fs->chmod($settingsPhpFile, 0444);
       }
     }