@@ -49,7 +49,7 @@ let
4949 # Database
5050 ZM_DB_TYPE=mysql
5151 ZM_DB_HOST=${cfg.database.host}
52− ZM_DB_NAME=${cfg.database.name}
52+ ZM_DB_NAME=${if cfg.database.createLocally then user else cfg.database.username}
5353 ZM_DB_USER=${cfg.database.username}
5454 ZM_DB_PASS=${cfg.database.password}
5555
@@ -205,12 +205,12 @@ in {
205205
206206 mysql = lib.mkIf cfg.database.createLocally {
207207 ensureDatabases = [ cfg.database.name ];
208+ initialDatabases = [{
209+ inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql";
210+ }];
208211 ensureUsers = [{
209212 name = cfg.database.username;
210213 ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
211− initialDatabases = [
212− { inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; }
213− ];
214214 }];
215215 };
216216