gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove redundant quotes

Browse Source
This commit is contained in:
volth
2019-08-13 21:52:01 +00:00
parent fe9c9f719d
commit 35d68ef143
293 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/atlassian/confluence.nix
View File

@@ -142,12 +142,12 @@ in
};
config = mkIf cfg.enable {
users.users."${cfg.user}" = {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
users.groups."${cfg.group}" = {};
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"

4
nixos/modules/services/web-apps/atlassian/crowd.nix
View File

@@ -110,12 +110,12 @@ in
};
config = mkIf cfg.enable {
users.users."${cfg.user}" = {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
users.groups."${cfg.group}" = {};
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"

4
nixos/modules/services/web-apps/atlassian/jira.nix
View File

@@ -148,12 +148,12 @@ in
};
config = mkIf cfg.enable {
users.users."${cfg.user}" = {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
users.groups."${cfg.group}" = {};
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"

6
nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
View File

@@ -163,7 +163,7 @@ in {
config = mkIf cfg.enable {
services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = ''
${poolName} = ''
listen = "${phpfpmSocketName}"
listen.owner = nginx
listen.group = nginx
@@ -188,7 +188,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = mkIf (cfg.virtualHost != null) {
"${cfg.virtualHost}" = {
${cfg.virtualHost} = {
root = "${pkgs.icingaweb2}/public";
extraConfig = ''
@@ -215,7 +215,7 @@ in {
# /etc/icingaweb2
environment.etc = let
doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
doModule = name: optionalAttrs (cfg.modules.${name}.enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
in {}
# Module packages
// (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages)

2
nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
View File

@@ -58,7 +58,7 @@ in {
};
backends = mkOption {
default = { "icinga" = { resource = "icinga_ido"; }; };
default = { icinga = { resource = "icinga_ido"; }; };
description = "Monitoring backends to define";
type = attrsOf (submodule ({ name, ... }: {
options = {

2
nixos/modules/services/web-apps/limesurvey.nix
View File

@@ -282,7 +282,7 @@ in
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
users.users."${user}".group = group;
users.users.${user}.group = group;
};
}

20
nixos/modules/services/web-apps/nextcloud.nix
View File

@@ -101,10 +101,10 @@ in {
phpOptions = mkOption {
type = types.attrsOf types.str;
default = {
"short_open_tag" = "Off";
"expose_php" = "Off";
"error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
"display_errors" = "stderr";
short_open_tag = "Off";
expose_php = "Off";
error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
display_errors = "stderr";
"opcache.enable_cli" = "1";
"opcache.interned_strings_buffer" = "8";
"opcache.max_accelerated_files" = "10000";
@@ -112,7 +112,7 @@ in {
"opcache.revalidate_freq" = "1";
"opcache.fast_shutdown" = "1";
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
"catch_workers_output" = "yes";
catch_workers_output = "yes";
};
description = ''
Options for PHP's php.ini file for nextcloud.
@@ -288,7 +288,7 @@ in {
];
}
{ systemd.timers."nextcloud-cron" = {
{ systemd.timers.nextcloud-cron = {
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "5m";
timerConfig.OnUnitActiveSec = "15m";
@@ -296,7 +296,7 @@ in {
};
systemd.services = {
"nextcloud-setup" = let
nextcloud-setup = let
c = cfg.config;
writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
overrideConfig = pkgs.writeText "nextcloud-config.php" ''
@@ -396,13 +396,13 @@ in {
'';
serviceConfig.Type = "oneshot";
};
"nextcloud-cron" = {
nextcloud-cron = {
environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud";
serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
};
"nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable {
nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
startAt = cfg.autoUpdateApps.startAt;
@@ -445,7 +445,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = {
"${cfg.hostName}" = {
${cfg.hostName} = {
root = pkgs.nextcloud;
locations = {
"= /robots.txt" = {

4
nixos/modules/services/web-apps/nexus.nix
View File

@@ -80,14 +80,14 @@ in
};
config = mkIf cfg.enable {
users.users."${cfg.user}" = {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
home = cfg.home;
createHome = true;
};
users.groups."${cfg.group}" = {};
users.groups.${cfg.group} = {};
systemd.services.nexus = {
description = "Sonatype Nexus3";

2
nixos/modules/services/web-apps/pgpkeyserver-lite.nix
View File

@@ -60,7 +60,7 @@ in
services.nginx.virtualHosts = let
hkpPort = builtins.toString cfg.hkpPort;
in {
"${cfg.hostname}" = {
${cfg.hostname} = {
root = webPkg;
locations = {
"/pks".extraConfig = ''

4
nixos/modules/services/web-apps/restya-board.nix
View File

@@ -179,7 +179,7 @@ in
config = mkIf cfg.enable {
services.phpfpm.pools = {
"${poolName}" = {
${poolName} = {
listen = phpfpmSocketName;
phpOptions = ''
date.timezone = "CET"
@@ -209,7 +209,7 @@ in
};
services.nginx.enable = true;
services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = {
services.nginx.virtualHosts.${cfg.virtualHost.serverName} = {
listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ];
serverName = cfg.virtualHost.serverName;
root = runDir;

2
nixos/modules/services/web-apps/selfoss.nix
View File

@@ -117,7 +117,7 @@ in
config = mkIf cfg.enable {
services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = ''
${poolName} = ''
listen = "${phpfpmSocketName}";
listen.owner = nginx
listen.group = nginx

4
nixos/modules/services/web-apps/tt-rss.nix
View File

@@ -520,7 +520,7 @@ let
];
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = {
${poolName} = {
listen = "/var/run/phpfpm/${poolName}.sock";
extraConfig = ''
listen.owner = nginx
@@ -542,7 +542,7 @@ let
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
virtualHosts = {
"${cfg.virtualHost}" = {
${cfg.virtualHost} = {
root = "${cfg.root}";
locations."/" = {

2
nixos/modules/services/web-apps/zabbix.nix
View File

@@ -16,7 +16,7 @@ let
<?php
// Zabbix GUI configuration file.
global $DB;
$DB['TYPE'] = '${ { "mysql" = "MYSQL"; "pgsql" = "POSTGRESQL"; "oracle" = "ORACLE"; }.${cfg.database.type} }';
$DB['TYPE'] = '${ { mysql = "MYSQL"; pgsql = "POSTGRESQL"; oracle = "ORACLE"; }.${cfg.database.type} }';
$DB['SERVER'] = '${cfg.database.host}';
$DB['PORT'] = '${toString cfg.database.port}';
$DB['DATABASE'] = '${cfg.database.name}';