From f0e464aba3c7363c4ec4a144124dfc0cee0b41c2 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 9 Jun 2015 17:18:59 +0100 Subject: Bug 1172953: Move contrib/docker/.* to docker/* --- Bugzilla/Install/Filesystem.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Bugzilla/Install') diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 5d4d84f88..2bbc9beea 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -177,8 +177,7 @@ sub FILESYSTEM { 'contrib/README' => { perms => OWNER_WRITE }, 'contrib/*/README' => { perms => OWNER_WRITE }, 'contrib/sendunsentbugmail.pl' => { perms => WS_EXECUTE }, - 'contrib/docker/*' => { perms => OWNER_WRITE }, - 'contrib/docker/*.pl' => { perms => OWNER_EXECUTE }, + 'docker/*' => { perms => OWNER_WRITE }, 'docs/bugzilla.ent' => { perms => OWNER_WRITE }, 'docs/makedocs.pl' => { perms => OWNER_EXECUTE }, 'docs/style.css' => { perms => WS_SERVE }, @@ -257,7 +256,7 @@ sub FILESYSTEM { dirs => DIR_WS_SERVE }, "$extensionsdir/*/web" => { files => WS_SERVE, dirs => DIR_WS_SERVE }, - + # Purpose: allow webserver to read .bzr so we execute bzr commands # in backticks and look at the result over the web. Used to show # bzr history. @@ -274,6 +273,8 @@ sub FILESYSTEM { dirs => DIR_OWNER_WRITE }, 'contrib' => { files => OWNER_EXECUTE, dirs => DIR_OWNER_WRITE, }, + 'docker' => { files => OWNER_EXECUTE, + dirs => DIR_OWNER_WRITE, }, ); # --- FILES TO CREATE --- # @@ -347,6 +348,8 @@ EOT contents => HT_DEFAULT_DENY }, 'contrib/.htaccess' => { perms => WS_SERVE, contents => HT_DEFAULT_DENY }, + 'docker/.htaccess' => { perms => WS_SERVE, + contents => HT_DEFAULT_DENY }, 't/.htaccess' => { perms => WS_SERVE, contents => HT_DEFAULT_DENY }, 'xt/.htaccess' => { perms => WS_SERVE, -- cgit v1.2.3-24-g4f1b