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.

2 files changed, 30 insertions, 15 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.
diff --git a/icecream.install b/icecream.install
index b2c5b4b54615..41da5a2fecd9 100644
--- a/icecream.install
+++ b/icecream.install
@@ -1,10 +1,12 @@
 post_install() {
-    getent group icecc &>/dev/null || groupadd -r icecc >/dev/null
-    getent passwd icecc &>/dev/null || useradd -r -g icecc -s /bin/false -c "Icecream Daemon" -d /var/cache/icecream icecc 2>/dev/null
+    getent group icecream &>/dev/null || groupadd -r icecream >/dev/null
+    getent passwd icecream &>/dev/null || useradd -r -g icecream -s /bin/false \
+	    -c "Icecream Daemon" -d /var/cache/icecream icecream 2>/dev/null
     mkdir -p /var/cache/icecream
-    touch /var/log/icecc_scheduler
-    touch /var/log/iceccd
-    chown -R icecc:icecc /var/cache/icecream /var/log/icecc_scheduler /var/log/iceccd
+    mkdir -p /var/log/icecream
+    touch /var/log/icecream/scheduler
+    touch /var/log/icecream/iceccd
+    chown -R icecream:icecream /var/cache/icecream /var/log/icecream/scheduler /var/log/icecream/iceccd
 }
 
 post_upgrade() {
@@ -12,7 +14,7 @@ post_upgrade() {
 }
 
 post_remove() {
-    getent passwd icecc &>/dev/null && userdel icecc >/dev/null
-    getent group icecc &>/dev/null && groupdel icecc >/dev/null
+    getent passwd icecream &>/dev/null && userdel icecream >/dev/null
+    getent group icecream &>/dev/null && groupdel icecream >/dev/null
     true
 }