|
|
|
|
@ -87,10 +87,8 @@ in { |
|
|
|
|
default = "/var/lib/nextcloud"; |
|
|
|
|
description = "Storage path of nextcloud."; |
|
|
|
|
}; |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
dataHome = mkOption { |
|
|
|
|
datadir = mkOption { |
|
|
|
|
type = types.str; |
|
|
|
|
description = "Storage path of nextcloud."; |
|
|
|
|
defaultText = "config.services.nextcloud.home"; |
|
|
|
|
description = '' |
|
|
|
|
Data storage path of nextcloud. Will be <xref linkend="opt-services.nextcloud.home" /> by default. |
|
|
|
|
@ -142,7 +140,6 @@ in { |
|
|
|
|
Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. |
|
|
|
|
''; |
|
|
|
|
}; |
|
|
|
|
>>>>>>> 34ad3ffe08adfca17fcb4e4a47bb5f3b113687be |
|
|
|
|
logLevel = mkOption { |
|
|
|
|
type = types.ints.between 0 4; |
|
|
|
|
default = 2; |
|
|
|
|
@ -650,8 +647,8 @@ in { |
|
|
|
|
[ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], |
|
|
|
|
[ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ], |
|
|
|
|
], |
|
|
|
|
'datadirectory' => '${cfg.dataHome}', |
|
|
|
|
>>>>>>> 34ad3ffe08adfca17fcb4e4a47bb5f3b113687be |
|
|
|
|
${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"} |
|
|
|
|
'datadirectory' => '${datadir}/data', |
|
|
|
|
'skeletondirectory' => '${cfg.skeletonDirectory}', |
|
|
|
|
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} |
|
|
|
|
'log_type' => 'syslog', |
|
|
|
|
@ -694,10 +691,8 @@ in { |
|
|
|
|
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; |
|
|
|
|
"--database-pass" = "\$${dbpass.arg}"; |
|
|
|
|
"--admin-user" = ''"${c.adminuser}"''; |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"--admin-pass" = adminpass; |
|
|
|
|
||||||| 8a2ec31e224 |
|
|
|
|
>>>>>>> 34ad3ffe08adfca17fcb4e4a47bb5f3b113687be |
|
|
|
|
"--admin-pass" = "\$${adminpass.arg}"; |
|
|
|
|
"--data-dir" = ''"${datadir}/data"''; |
|
|
|
|
}); |
|
|
|
|
in '' |
|
|
|
|
${mkExport dbpass} |
|
|
|
|
@ -747,7 +742,7 @@ in { |
|
|
|
|
|
|
|
|
|
# create nextcloud directories. |
|
|
|
|
# if the directories exist already with wrong permissions, we fix that |
|
|
|
|
for dir in ${cfg.home}/config ${cfg.dataHome} ${cfg.home}/store-apps; do |
|
|
|
|
for dir in ${datadir}/config ${datadir}/data ${cfg.home}/store-apps ${cfg.home}/nix-apps; do |
|
|
|
|
if [ ! -e $dir ]; then |
|
|
|
|
install -o nextcloud -g nextcloud -d $dir |
|
|
|
|
elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then |
|
|
|
|
|
