mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #278493 from marrobHD/patch-1
nixos/nextcloud: fix dbport in config.php
This commit is contained in:
commit
e55b4c1ec7
|
@ -125,6 +125,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||||
- `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains) and
|
- `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains) and
|
||||||
- `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.extraOptions.trusted_proxies).
|
- `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.extraOptions.trusted_proxies).
|
||||||
|
|
||||||
|
- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream.
|
||||||
|
The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).
|
||||||
|
|
||||||
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
|
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
|
||||||
non-child processes. This means you will not be able to attach gdb to an
|
non-child processes. This means you will not be able to attach gdb to an
|
||||||
existing process, but will need to start that process from gdb (so it is a
|
existing process, but will need to start that process from gdb (so it is a
|
||||||
|
|
|
@ -132,6 +132,9 @@ in {
|
||||||
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
|
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
|
||||||
Use services.nextcloud.enableImagemagick instead.
|
Use services.nextcloud.enableImagemagick instead.
|
||||||
'')
|
'')
|
||||||
|
(mkRemovedOptionModule [ "services" "nextcloud" "config" "dbport" ] ''
|
||||||
|
Add port to services.nextcloud.config.dbhost instead.
|
||||||
|
'')
|
||||||
(mkRenamedOptionModule
|
(mkRenamedOptionModule
|
||||||
[ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "extraOptions" "loglevel" ])
|
[ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "extraOptions" "loglevel" ])
|
||||||
(mkRenamedOptionModule
|
(mkRenamedOptionModule
|
||||||
|
@ -363,18 +366,14 @@ in {
|
||||||
else if mysqlLocal then "localhost:/run/mysqld/mysqld.sock"
|
else if mysqlLocal then "localhost:/run/mysqld/mysqld.sock"
|
||||||
else "localhost";
|
else "localhost";
|
||||||
defaultText = "localhost";
|
defaultText = "localhost";
|
||||||
|
example = "localhost:5000";
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Database host or socket path.
|
Database host (+port) or socket path.
|
||||||
If [](#opt-services.nextcloud.database.createLocally) is true and
|
If [](#opt-services.nextcloud.database.createLocally) is true and
|
||||||
[](#opt-services.nextcloud.config.dbtype) is either `pgsql` or `mysql`,
|
[](#opt-services.nextcloud.config.dbtype) is either `pgsql` or `mysql`,
|
||||||
defaults to the correct Unix socket instead.
|
defaults to the correct Unix socket instead.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
dbport = mkOption {
|
|
||||||
type = with types; nullOr (either int str);
|
|
||||||
default = null;
|
|
||||||
description = lib.mdDoc "Database port.";
|
|
||||||
};
|
|
||||||
dbtableprefix = mkOption {
|
dbtableprefix = mkOption {
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
default = null;
|
default = null;
|
||||||
|
@ -886,7 +885,6 @@ in {
|
||||||
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
|
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
|
||||||
${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
|
${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
|
||||||
${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"}
|
${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"}
|
||||||
${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"}
|
|
||||||
${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"}
|
${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"}
|
||||||
${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"}
|
${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"}
|
||||||
${optionalString (c.dbpassFile != null) ''
|
${optionalString (c.dbpassFile != null) ''
|
||||||
|
@ -931,7 +929,6 @@ in {
|
||||||
# will be omitted.
|
# will be omitted.
|
||||||
${if c.dbname != null then "--database-name" else null} = ''"${c.dbname}"'';
|
${if c.dbname != null then "--database-name" else null} = ''"${c.dbname}"'';
|
||||||
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
|
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
|
||||||
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
|
|
||||||
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
|
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
|
||||||
"--database-pass" = "\"\$${dbpass.arg}\"";
|
"--database-pass" = "\"\$${dbpass.arg}\"";
|
||||||
"--admin-user" = ''"${c.adminuser}"'';
|
"--admin-user" = ''"${c.adminuser}"'';
|
||||||
|
|
Loading…
Reference in a new issue