Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bbfd2be8edfa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea32c785994d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 9, 2019

  1. zonminder: Fix database name and username 

    PR #56889 messed up db and use naming while fixing the scope of the initialDatabases property.
This patch fixes the issue.
    @amazari
    amazari committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: 06121D366FE9435C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56aa491 View commit details

  2. Merge pull request #57125 from amazari/fix-zoneminder-local-db2 

    zoneminder: Fix database name and username
    @7c6f434c
    7c6f434c authored Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: 06121D366FE9435C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea32c78 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/misc/zoneminder.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/misc/zoneminder.nix
View file
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ let
# Database
ZM_DB_TYPE=mysql
ZM_DB_HOST=${cfg.database.host}
ZM_DB_NAME=${if cfg.database.createLocally then user else cfg.database.username}
ZM_DB_USER=${cfg.database.username}
ZM_DB_NAME=${cfg.database.name}
ZM_DB_USER=${if cfg.database.createLocally then user else cfg.database.username}
ZM_DB_PASS=${cfg.database.password}
# Web