Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change some defaults for nicer out of the box experience. #89

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

change some defaults for nicer out of the box experience. #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Bugzilla/Install/Localconfig.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ use constant LOCALCONFIG_VARS => (
{name => 'create_htaccess', default => 1,},
{name => 'webservergroup', default => \&_sensible_group,},
{name => 'use_suexec', default => 0,},
{name => 'db_driver', default => 'mysql',},
{name => 'db_driver', default => 'sqlite',},
{name => 'db_host', default => 'localhost',},
{name => 'db_name', default => 'bugs',},
{
Expand Down Expand Up @@ -95,7 +95,7 @@ use constant LOCALCONFIG_VARS => (
{name => 'size_limit', default => 750000,},
{name => 'memcached_servers', default => '',},
{name => 'memcached_namespace', default => "bugzilla:",},
{name => 'urlbase', default => '',},
{name => 'urlbase', default => 'http://127.0.0.1:3001/'},
{name => 'canonical_urlbase', lazy => 1},
{name => 'nobody_user', default => '[email protected]'},
{name => 'attachment_base', default => '',},
Expand Down Expand Up @@ -243,7 +243,7 @@ sub update_localconfig {
$value = undef
if ($name eq 'site_wide_secret' and defined $value and length($value) == 256);

if (!defined $value) {
if (!defined $value && $name ne 'canonical_urlbase') {
push(@new_vars, $name);
$var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
if (exists $answer->{$name}) {
Expand Down
2 changes: 1 addition & 1 deletion Bugzilla/Localconfig.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ has 'basepath' => (is => 'lazy');
# Use the site's URL as the default Canonical URL
sub _build_canonical_urlbase {
my ($self) = @_;
$self->urlbase;
$self->urlbase // '';
}

sub _build_basepath {
Expand Down
2 changes: 1 addition & 1 deletion Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ WriteMakefile(

sub MY::postamble {
return <<"MAKE";
GEN_CPANFILE_ARGS = -D better_xff -D mysql -D jsonrpc -D xmlrpc
GEN_CPANFILE_ARGS = -D better_xff -D sqlite -D jsonrpc -D xmlrpc
cpanfile: MYMETA.json
\t\$(PERLRUN) gen-cpanfile.pl \$(GEN_CPANFILE_ARGS)

Expand Down
11 changes: 2 additions & 9 deletions cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
requires 'Algorithm::BloomFilter', '0.02';
requires 'Bytes::Random::Secure';
requires 'CGI', '4.31';
requires 'CGI::Compile';
requires 'CGI::Emulate::PSGI';
Expand All @@ -9,9 +8,7 @@ requires 'Class::XSAccessor', '1.18';
requires 'Crypt::CBC';
requires 'Crypt::DES';
requires 'Crypt::DES_EDE3';
requires 'Crypt::OpenPGP', '1.12';
requires 'Crypt::SMIME';
requires 'DBD::mysql', '4.037';
requires 'DBD::SQLite', '1.29';
requires 'DBI', '1.614';
requires 'DBIx::Class';
requires 'DBIx::Class::Helpers', '2.034002';
Expand All @@ -20,7 +17,7 @@ requires 'Daemon::Generic';
requires 'Date::Format', '2.23';
requires 'Date::Parse', '2.31';
requires 'DateTime', '0.75';
requires 'DateTime::Format::MySQL', '0.06';
requires 'DateTime::Format::SQLite', '0.11';
requires 'DateTime::TimeZone', '2.11';
requires 'Devel::NYTProf', '6.04';
requires 'Digest::SHA', '5.47';
Expand Down Expand Up @@ -61,7 +58,6 @@ requires 'Net::DNS';
requires 'Package::Stash', '0.37';
requires 'Parse::CPAN::Meta', '1.44';
requires 'PerlX::Maybe';
requires 'Pod::Coverage::TrustPod';
requires 'Regexp::Common';
requires 'Role::Tiny', '2.000003';
requires 'SOAP::Lite', '0.712';
Expand All @@ -70,9 +66,6 @@ requires 'Sereal', '4.004';
requires 'Sub::Quote', '2.005000';
requires 'Sys::Syslog';
requires 'Template', '2.24';
requires 'Test::CPAN::Meta';
requires 'Test::Pod';
requires 'Test::Pod::Coverage';
requires 'Test::Taint', '1.06';
requires 'Text::CSV_XS', '1.26';
requires 'Text::Diff';
Expand Down
5 changes: 3 additions & 2 deletions extensions/BugModal/lib/ActivityStream.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,9 @@ sub _add_duplicates_to_stream {
my $dbh = Bugzilla->dbh;

my $sth = $dbh->prepare("
SELECT longdescs.who,
UNIX_TIMESTAMP(bug_when), " . $dbh->sql_date_format('bug_when') . ",
SELECT longdescs.who, "
. $dbh->sql_date_format('bug_when', '%s') . ", "
. $dbh->sql_date_format('bug_when') . ",
type,
extra_data
FROM longdescs
Expand Down
3 changes: 2 additions & 1 deletion scripts/nagios_blocker_checker.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,9 @@
$where .= " AND bug_severity IN ($severities)";
}

my $ts_sql = $dbh->sql_date_format('bugs.creation_ts', '%s');
my $sql = <<"EOF";
SELECT bug_id, bug_severity, UNIX_TIMESTAMP(bugs.creation_ts) AS ts
SELECT bug_id, bug_severity, $ts_sql AS ts
FROM bugs
WHERE $where
AND COALESCE(resolution, '') = ''
Expand Down