diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-07-06 21:21:04 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-07-06 21:21:04 +0200 |
| commit | b758be1d37cb49ced8cb17fca3d5a4cb2dd2e03e (patch) | |
| tree | 01d7b7c5a5fcd5dddc0ed4adc55a60917ce70bce /Bugzilla | |
| parent | f70d4ce7e0a94379bb901559109650874946c84b (diff) | |
| download | bugzilla-b758be1d37cb49ced8cb17fca3d5a4cb2dd2e03e.tar.gz bugzilla-b758be1d37cb49ced8cb17fca3d5a4cb2dd2e03e.tar.xz | |
Bug 1172968: Move the scripts we want to keep from contrib/* and place them in scripts/ directory. Remove contrib from repo
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 9 | ||||
| -rw-r--r-- | Bugzilla/JobQueue/Runner.pm | 11 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 5432bddfa..4323975bc 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -173,10 +173,7 @@ sub FILESYSTEM { 'robots.txt' => { perms => WS_SERVE }, '.htaccess' => { perms => WS_SERVE }, 'cvs-update.log' => { perms => WS_SERVE }, - - 'contrib/README' => { perms => OWNER_WRITE }, - 'contrib/*/README' => { perms => OWNER_WRITE }, - 'contrib/sendunsentbugmail.pl' => { perms => WS_EXECUTE }, + 'scripts/sendunsentbugmail.pl' => { perms => WS_EXECUTE }, 'docker/*' => { perms => OWNER_WRITE }, 'docker/*.pl' => { perms => OWNER_EXECUTE }, 'docker/*.sh' => { perms => OWNER_EXECUTE }, @@ -275,6 +272,8 @@ sub FILESYSTEM { dirs => DIR_OWNER_WRITE }, 'contrib' => { files => OWNER_EXECUTE, dirs => DIR_OWNER_WRITE, }, + 'scripts' => { files => OWNER_EXECUTE, + dirs => DIR_OWNER_WRITE, }, 'docker' => { files => OWNER_EXECUTE, dirs => DIR_OWNER_WRITE, }, ); @@ -350,6 +349,8 @@ EOT contents => HT_DEFAULT_DENY }, 'contrib/.htaccess' => { perms => WS_SERVE, contents => HT_DEFAULT_DENY }, + 'scripts/.htaccess' => { perms => WS_SERVE, + contents => HT_DEFAULT_DENY }, 'docker/.htaccess' => { perms => WS_SERVE, contents => HT_DEFAULT_DENY }, 't/.htaccess' => { perms => WS_SERVE, diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm index d45c36647..0dec85d74 100644 --- a/Bugzilla/JobQueue/Runner.pm +++ b/Bugzilla/JobQueue/Runner.pm @@ -103,14 +103,9 @@ sub gd_usage { sub gd_can_install { my $self = shift; - my $source_file; - if ( -e "/etc/SuSE-release" ) { - $source_file = "contrib/$initscript.suse"; - } else { - $source_file = "contrib/$initscript.rhel"; - } - my $dest_file = "$initd/$initscript"; - my $sysconfig = '/etc/sysconfig'; + my $source_file = "scripts/$initscript.rhel"; + my $dest_file = "$initd/$initscript"; + my $sysconfig = '/etc/sysconfig'; my $config_file = "$sysconfig/$initscript"; if (!-x $chkconfig or !-d $initd) { |