Improve conf files

Add firewalld service rulesets

6 files changed, 60 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 176d17e..c6a28f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=icecream
 _exname=$pkgname-scheduler
 pkgver=1.3.1
-pkgrel=1
+pkgrel=1.2
 pkgdesc="Distributed compiler with a central scheduler to share build load"
 url="https://github.com/icecc/icecream"
 license=('GPL2')
@@ -30,13 +30,20 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/icecc/$pkgname/archive/$pkgv
         $pkgname.confd
         $_exname.initd
         $_exname.confd
-        ld-$pkgname.conf)
+        ld-$pkgname.conf
+        icecream.xml
+        icecream-telnet.xml
+        icecream-scheduler.xml
+        )
 b2sums=('d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5'
         'a2c931315fa807f6e7372822283a35eb591f538a9e3ac467040e7037e7342639f35aaddd778ad9c09e07296d78cc8cd91cf58f19f98a8819784cf8f1153b2084'
-        'e155500a2a7670fca71b650c08f253d3f40613d25224ddd1877394d689bbd849e0b7935a471928d999eba576c7a637b82e8156360fc45ee7707fffabba6fec05'
+        '529b8edbaf2e1c1b3adc54abc691c34280be91f1d627d3d898a4c960119f6a1131b5392fff7c8ce204d8265a9852e9cd0d4a47241de47ef1deb9669ee8088d7e'
         '328245a843752bcceea2414627427f3b899af5fce986dd6abe37ae050d06e50e87a32a915a8a08c8dfb66e49e9439429fbe7922b844a5e04deaee5fbf728b029'
-        '7b021b4d8d375c917da25751c2a2417d11245bdd092f02579dc3a6e15172ad0032ba4f40ae5a5b027379e3e492c73b7532d9a258f453a5eda9931128b3dadc86'
-        '6402d7968df89e189ab453e0b0dd3ecec693bfaa982f04672c504036a7379147f97a84e1107e2d3ee393b63a7ea7f11155eca07254d74c20d849292c605bf973')
+        'b0d5f38d49a410ca5c45ebd2c073697833bccdf5da48fb8724e4cccecfbda85e53a431ed802535bcc2fb337656d6581508c63394d8338a40b3620cb00657a022'
+        '6402d7968df89e189ab453e0b0dd3ecec693bfaa982f04672c504036a7379147f97a84e1107e2d3ee393b63a7ea7f11155eca07254d74c20d849292c605bf973'
+        '7087aaeacdc5589fce8f993ca959ea62510bf43702269f860a2fd477b1b63b89503e1c65071654e9a14069940120d0a080d42d2993451f15e58648f2d14a573b'
+        '632e229678c991e19a9bd5eb263ae1cffbc3df0ba0f23d0d6033ecb18cc85719d6a56eec486026b8524f77d3a049d21469958b158a869a06df3d528f04dd4f31'
+        'f955f378a5dded1b3552760aa5b55352fe85ced57b1f6743c723c7b24b3ef95ff25e4d321db1d30f4e506e6002c0f53a0ffc7bb4d997f8a72bfe802349ae96ef')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
@@ -58,4 +65,9 @@ package() {
   # moving pkg-config file to its usual place
   install -D -m644 "${pkgdir}/usr/lib/$pkgname/lib/pkgconfig/icecc.pc" "${pkgdir}/usr/lib/pkgconfig/icecc.pc"
   rm -rf "${pkgdir}/usr/lib/$pkgname/lib/pkgconfig"
+  
+  # place the firewalld service rulesets
+  install -D -m644 "$srcdir"/icecream.xml "$pkgdir/usr/lib/firewalld/services/icecream.xml"
+  install -D -m644 "$srcdir"/icecream-telnet.xml "$pkgdir/usr/lib/firewalld/services/icecream-telnet.xml"
+  install -D -m644 "$srcdir"/icecream-scheduler.xml "$pkgdir/usr/lib/firewalld/services/icecream-scheduler.xml"
 }
diff --git a/icecream-scheduler.confd b/icecream-scheduler.confd
index 3836c9f..34848d0 100644
--- a/icecream-scheduler.confd
+++ b/icecream-scheduler.confd
@@ -1,7 +1,10 @@
+# User to run the service as
+ICECREAM_USER="-u icecream"
+
 # Identification for the network the scheduler and daemon run on.
-NETNAME="icecream"
+ICECREAM_NETNAME="-n icecream"
 
 # icecream scheduler log file
-ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecream/scheduler"
+ICECREAM_SCHEDULER_LOG_FILE="-l /var/log/icecream/scheduler"
 
-ICECREAM_SCHEDULER_OPTS="-u icecream -n $NETNAME -l $ICECREAM_SCHEDULER_LOG_FILE"
+ICECREAM_SCHEDULER_OPTS=" ${ICECREAM_USER} ${ICECREAM_NETNAME} ${ICECREAM_SCHEDULER_LOG_FILE}"
diff --git a/icecream-scheduler.xml b/icecream-scheduler.xml
new file mode 100644
index 0000000..050eb26
--- /dev/null
+++ b/icecream-scheduler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>icecream-scheduler</short>
+  <description>icecream scheduler daemon</description>
+  <port port="8765" protocol="tcp"/>
+</service>
diff --git a/icecream-telnet.xml b/icecream-telnet.xml
new file mode 100644
index 0000000..8807e2b
--- /dev/null
+++ b/icecream-telnet.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>icecream-telnet</short>
+  <description>icecream scheduler monitor</description>
+  <port port="8766" protocol="tcp"/>
+</service>
diff --git a/icecream.confd b/icecream.confd
index 16f79d9..74ed11e 100644
--- a/icecream.confd
+++ b/icecream.confd
@@ -1,32 +1,37 @@
-# Identification for the network the scheduler and daemon run on.
-NETNAME="icecream"
+# User to run the service as.
+ICECREAM_USER="-u icecream"
+
+# Identification for the network the daemon will connect to.
+ICECREAM_NETNAME="-n icecream"
 
 # icecream daemon log file
-ICECREAM_LOG_FILE="/var/log/icecream/iceccd"
+ICECREAM_LOG_FILE="-l /var/log/icecream/iceccd"
 
-# Nice level of running compilers
-NICE="5"
+# Nice level of running compilers.
+ICECREAM_NICE="--nice 5"
 
 # If the daemon can't find the scheduler by broadcast (e.g. because
 # of a firewall) you can specify it.
-#SCHEDULER=""
+#ICECREAM_SCHEDULER="-s 127.0.0.1"
 
 # This is the directory where the icecream daemon stores the environments
 # it compiles in. In a big network this can grow quite a bit, so use some
 # path if your /tmp is small - but the user icecream has to write to it.
-ICECREAM_BASEDIR="/var/cache/icecream"
+ICECREAM_BASEDIR="-b /var/cache/icecream"
 
 # You can overwrite here the number of jobs to run in parallel. Per
 # default this depends on the number of (virtual) CPUs installed.
 #
 # Note: a value of "0" is actually interpreted as "1", however it
 # also sets ICECREAM_ALLOW_REMOTE="no".
-#MAXJOBS=""
+#ICECREAM_MAXJOBS="-m 4"
 
 # Specifies whether jobs submitted by other nodes are allowed to run on
 # this one.
-#NOREMOTE="--no-remote"
+#ICECREAM_NOREMOTE="--no-remote"
+
+# Specifies the cache size stored on disk in the ICECREAM_BASEDIR
+# Default is 256 MiB
+ICECREAM_CACHELIMIT="--cache-limit 1024"
 
-#ICECREAM_OPTS="-u icecream -n $NETNAME -l $ICECREAM_LOG_FILE --nice $NICE -s $SCHEDULER -b ${ICECREAM_BASEDIR} ${MAXJOBS} ${NOREMOTE}"
-#ICECREAM_OPTS="-u icecream -n $NETNAME -l $ICECREAM_LOG_FILE --nice $NICE -s $SCHEDULER -b ${ICECREAM_BASEDIR}"
-ICECREAM_OPTS="-u icecream -n $NETNAME -l $ICECREAM_LOG_FILE --nice $NICE -b ${ICECREAM_BASEDIR}"
+ICECREAM_OPTS=" ${ICECREAM_USER} ${ICECREAM_NETNAME} ${ICECREAM_LOG_FILE} ${ICECREAM_NICE} ${ICECREAM_SCHEDULER} ${ICECREAM_BASEDIR} ${ICECREAM_MAXJOBS} ${ICECREAM_NOREMOTE} ${ICECREAM_CACHELIMIT}"
diff --git a/icecream.xml b/icecream.xml
new file mode 100644
index 0000000..7d04136
--- /dev/null
+++ b/icecream.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>icecream</short>
+  <description>icecream client daemon</description>
+  <port port="8765" protocol="udp"/>
+  <port port="10245" protocol="tcp"/>
+  <source-port port="8765" protocol="udp"/>
+</service>