summarylogtreecommitdiffstats
path: root/icecream.conf
diff options
context:
space:
mode:
authorBen Widawsky2015-12-11 20:52:30 -0800
committerBen Widawsky2015-12-24 10:53:13 -0800
commit5e8f7eebc937c2ee9a560ab08060a419c5206011 (patch)
tree0630280e0ac03e607c1e64706fd382d344d58431 /icecream.conf
parent1e04d1482bf63d555ecc060532013bd27bfd9651 (diff)
downloadaur-5e8f7eebc937c2ee9a560ab08060a419c5206011.tar.gz
Merge upstream's suse/sysconfig.icecream
This amounts to log file location changes (to its own subdirectory), and user/group changes (from icecc->icecream). Also, typo fixes.
Diffstat (limited to 'icecream.conf')
-rw-r--r--icecream.conf29
1 files changed, 21 insertions, 8 deletions
diff --git a/icecream.conf b/icecream.conf
index 1e7bc7e0c79b..9aefefdd0591 100644
--- a/icecream.conf
+++ b/icecream.conf
@@ -12,25 +12,38 @@ ICECREAM_NICE_LEVEL="5"
#
## Type: string
## Path: Applications/icecream
-## Defaut: /var/log/iceccd
+## Default: /var/log/icecream/iceccd
#
# icecream daemon log file
#
-ICECREAM_LOG_FILE="/var/log/iceccd"
+ICECREAM_LOG_FILE="/var/log/icecream/iceccd"
#
## Type: string
## Path: Applications/icecream
-## Defaut: /var/log/icecc_scheduler
+## Default: no
+#
+# Start also the scheduler?
+#
+# XXX: The SuSE package uses one init file instead of two systemd files.
+# Therefore, this variable has meaning. For Arch Linux, this variable has no
+# meaning, but it is maintained here to make an easier diff.
+#
+#ICECREAM_RUN_SCHEDULER="no"
+
+#
+## Type: string
+## Path: Applications/icecream
+## Default: /var/log/icecream/scheduler
#
# icecream scheduler log file
#
-ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
+ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecream/scheduler"
#
## Type: string
## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
#
# Identification for the network the scheduler and daemon run on.
# You can have several distinct icecream networks in the same LAN
@@ -41,7 +54,7 @@ ICECREAM_NETNAME=""
#
## Type: string
## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
#
# If the daemon can't find the scheduler by broadcast (e.g. because
# of a firewall) you can specify it.
@@ -51,7 +64,7 @@ ICECREAM_SCHEDULER_HOST=""
#
## Type: integer
## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
#
# You can overwrite here the number of jobs to run in parallel. Per
# default this depends on the number of (virtual) CPUs installed.
@@ -64,7 +77,7 @@ ICECREAM_MAX_JOBS=""
#
## Type: yesno
## Path: Applications/icecream
-## Defaut: "yes"
+## Default: "yes"
#
# Specifies whether jobs submitted by other nodes are allowed to run on
# this one.