summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2015-06-09 18:18:59 +0200
committerDavid Lawrence <dkl@mozilla.com>2015-06-09 18:18:59 +0200
commitf0e464aba3c7363c4ec4a144124dfc0cee0b41c2 (patch)
treedcfcae514319d85e5c1e7674471ddf8b400a886f
parentf1f6f3f45cd113377810cac99c32d8b0728a270a (diff)
downloadbugzilla-f0e464aba3c7363c4ec4a144124dfc0cee0b41c2.tar.gz
bugzilla-f0e464aba3c7363c4ec4a144124dfc0cee0b41c2.tar.xz
Bug 1172953: Move contrib/docker/.* to docker/*
-rw-r--r--Bugzilla/Install/Filesystem.pm9
1 files changed, 6 insertions, 3 deletions
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,