diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index e5b1bdb76..646d4eea6 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -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',}, { @@ -100,7 +100,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 => 'logging_method', default => 'syslog'}, {name => 'nobody_user', default => 'nobody@mozilla.org'}, @@ -249,7 +249,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}) { diff --git a/Bugzilla/Localconfig.pm b/Bugzilla/Localconfig.pm index 7a3a3d26a..b6d264acc 100644 --- a/Bugzilla/Localconfig.pm +++ b/Bugzilla/Localconfig.pm @@ -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 { diff --git a/Makefile.PL b/Makefile.PL index 1bc4f05ee..1ae7dc483 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -401,7 +401,7 @@ WriteMakefile( sub MY::postamble { return <<"MAKE"; -GEN_CPANFILE_ARGS = -D better_xff -D mariadb -D jsonrpc -D xmlrpc -D documentation -D pg +GEN_CPANFILE_ARGS = -D better_xff -D sqlite -D jsonrpc -D xmlrpc -D documentation cpanfile: MYMETA.json \t\$(PERLRUN) gen-cpanfile.pl \$(GEN_CPANFILE_ARGS) diff --git a/extensions/BugModal/lib/ActivityStream.pm b/extensions/BugModal/lib/ActivityStream.pm index c3fe4d88d..b65123d8c 100644 --- a/extensions/BugModal/lib/ActivityStream.pm +++ b/extensions/BugModal/lib/ActivityStream.pm @@ -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 diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl index 7d04f01f6..695c7a283 100755 --- a/scripts/nagios_blocker_checker.pl +++ b/scripts/nagios_blocker_checker.pl @@ -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, '') = ''