From 0f3d054b3e7d5ea8c9cf40706e76ba58413b45c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 11 Mar 2021 11:45:05 +0100
Subject: [PATCH 01/20] First try of building and pushing an rpm package.

---
 .github/workflows/nightly.yml        | 35 +++++++++++++++++-
 .rpm/stackable-agent.spec            | 54 ++++++++++++++++++++++++++++
 .rpm/systemd/stackable-agent.service | 14 ++++++++
 Cargo.toml                           | 14 +++++++-
 4 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 .rpm/stackable-agent.spec
 create mode 100644 .rpm/systemd/stackable-agent.service

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7ecfe0b..0c19cf8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - rpm
 
 env:
   CARGO_TERM_COLOR: always
@@ -25,4 +26,36 @@ jobs:
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
           -H "Content-Type: multipart/form-data"
           --data-binary "@./$(find target/debian/ -name *.deb)"
-          "https://repo.stackable.tech/repository/deb-nightly/"
\ No newline at end of file
+          "https://repo.stackable.tech/repository/deb-nightly/"
+
+  centos7:
+    runs-on: centos7
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build rpm package
+        run: ~/.cargo/bin/cargo rpm build
+      - name: Publish rpm package
+        run: >-
+          /usr/bin/curl
+          -vvvv
+          --fail
+          -u 'github:${{ secrets.NEXUS_PASSWORD }}'
+          -H "Content-Type: multipart/form-data"
+          --data-binary "@./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
+          "https://repo.stackable.tech/repository/rpm-nightly/el7"
+
+  centos8:
+    runs-on: centos8
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build rpm package
+        run: ~/.cargo/bin/cargo rpm build
+      - name: Publish rpm package
+        run: >-
+          /usr/bin/curl
+          -vvvv
+          --fail
+          -u 'github:${{ secrets.NEXUS_PASSWORD }}'
+          -H "Content-Type: multipart/form-data"
+          --data-binary "@./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
+          "https://repo.stackable.tech/repository/rpm-nightly/el8"
\ No newline at end of file
diff --git a/.rpm/stackable-agent.spec b/.rpm/stackable-agent.spec
new file mode 100644
index 0000000..58db8c8
--- /dev/null
+++ b/.rpm/stackable-agent.spec
@@ -0,0 +1,54 @@
+%define __spec_install_post %{nil}
+%define __os_install_post %{_dbpath}/brp-compress
+%define debug_package %{nil}
+%define _bindir /opt/stackable-agent
+%define _confdir /etc/stackable-agent
+%define _systemdir /lib/systemd/system
+
+Name: stackable-agent
+Summary: Tha component of the Stackable Platform that manages installation of services on the workers
+Version: @@VERSION@@
+Release: @@RELEASE@@%{?dist}
+License: ASL 2.0
+Group: Applications/System
+Source0: %{name}-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+%{summary}
+
+%prep
+%setup -q
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+cp -a * %{buildroot}
+
+%post
+systemctl daemon-reload
+
+%preun
+if [ $1 == 0 ]; then #uninstall
+  systemctl unmask %{name}.service
+  systemctl stop %{name}.service
+  systemctl disable %{name}.service
+fi
+
+%postun
+if [ $1 == 0 ]; then #uninstall
+  systemctl daemon-reload
+  systemctl reset-failed
+fi
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_confdir}/*
+%{_systemdir}/%{name}.service
+
+
diff --git a/.rpm/systemd/stackable-agent.service b/.rpm/systemd/stackable-agent.service
new file mode 100644
index 0000000..1825efa
--- /dev/null
+++ b/.rpm/systemd/stackable-agent.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Stackable Agent
+Before=
+After=network.target
+[Service]
+User=root
+ExecStart=/opt/stackable-agent/stackable-agent
+Restart=on-abort
+StandardOutput=journal
+StandardError=journal
+Environment="CONFIG_FILE=/etc/stackable-agent/agent.conf"
+Environment="RUST_LOG=info"
+[Install]
+WantedBy=multi-user.target
diff --git a/Cargo.toml b/Cargo.toml
index abfdc61..6d3dac3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,4 +55,16 @@ systemd-units = { enable = false }
 assets = [
     ["packaging/config/agent.conf", "etc/stackable-agent/", "644"],
     ["target/release/agent", "opt/stackable-agent/stackable-agent", "755"],
-]
\ No newline at end of file
+]
+[package.metadata.rpm]
+package = "stackable-agent"
+
+[package.metadata.rpm.cargo]
+buildflags = ["--release"]
+
+[package.metadata.rpm.targets]
+agent = { path = "/opt/stackable-agent/stackable-agent" }
+
+[package.metadata.rpm.files]
+"config/agent.conf" = { path = "/etc/stackable-agent/agent.conf"}
+"systemd/stackable-agent.service" = { path = "/lib/systemd/system/stackable-agent.service"}
\ No newline at end of file

From 7cd70058985cd0af3ecab82badace76f36d9bfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 11 Mar 2021 11:58:00 +0100
Subject: [PATCH 02/20] Added debug flags to rpm build process and forgotten
 config file.

---
 .github/workflows/nightly.yml | 4 ++--
 .rpm/config/agent.conf        | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .rpm/config/agent.conf

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 0c19cf8..5428e32 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build rpm package
-        run: ~/.cargo/bin/cargo rpm build
+        run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
           /usr/bin/curl
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build rpm package
-        run: ~/.cargo/bin/cargo rpm build
+        run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
           /usr/bin/curl
diff --git a/.rpm/config/agent.conf b/.rpm/config/agent.conf
new file mode 100644
index 0000000..19ae909
--- /dev/null
+++ b/.rpm/config/agent.conf
@@ -0,0 +1,5 @@
+--package-directory=/var/lib/stackable/packages
+--config-directory=/var/lib/stackable/config
+--data-directory=/var/lib/stackable/agent
+--server-key-file=/var/lib/stackable/agent/config/agent.key
+--server-cert-file=/var/lib/stackable/agent/config/agent.crt
\ No newline at end of file

From 77e7b4265161b5df679814ee4bfb4e15e28b44b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 11 Mar 2021 12:26:59 +0100
Subject: [PATCH 03/20] Fixes for rpm publishing process.

---
 .github/workflows/nightly.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5428e32..9839cac 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -36,13 +36,12 @@ jobs:
         run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
-          /usr/bin/curl
-          -vvvv
-          --fail
+          /usr/bin/curl \
+          -vvvv \
+          --fail \
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          -H "Content-Type: multipart/form-data"
-          --data-binary "@./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
-          "https://repo.stackable.tech/repository/rpm-nightly/el7"
+          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)" \
+          "https://repo.stackable.tech/repository/rpm-nightly/el7/"
 
   centos8:
     runs-on: centos8
@@ -52,10 +51,9 @@ jobs:
         run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
-          /usr/bin/curl
-          -vvvv
-          --fail
+          /usr/bin/curl \
+          -vvvv \
+          --fail \
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          -H "Content-Type: multipart/form-data"
-          --data-binary "@./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
-          "https://repo.stackable.tech/repository/rpm-nightly/el8"
\ No newline at end of file
+          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)" \
+          "https://repo.stackable.tech/repository/rpm-nightly/el8/"
\ No newline at end of file

From 26d1a5aed715e033426a7a8c613814ddc565864c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 11 Mar 2021 12:36:21 +0100
Subject: [PATCH 04/20] Removed leftover backslashes from testing this in shell
 script. Added directory creation

---
 .github/workflows/nightly.yml | 16 ++++++++--------
 .rpm/stackable-agent.spec     |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 9839cac..b828a2b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -36,11 +36,11 @@ jobs:
         run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
-          /usr/bin/curl \
-          -vvvv \
-          --fail \
+          /usr/bin/curl
+          -vvvv
+          --fail
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)" \
+          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
           "https://repo.stackable.tech/repository/rpm-nightly/el7/"
 
   centos8:
@@ -51,9 +51,9 @@ jobs:
         run: ~/.cargo/bin/cargo rpm build -vvvvv
       - name: Publish rpm package
         run: >-
-          /usr/bin/curl \
-          -vvvv \
-          --fail \
+          /usr/bin/curl
+          -vvvv
+          --fail
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)" \
+          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
           "https://repo.stackable.tech/repository/rpm-nightly/el8/"
\ No newline at end of file
diff --git a/.rpm/stackable-agent.spec b/.rpm/stackable-agent.spec
index 58db8c8..73dbcbc 100644
--- a/.rpm/stackable-agent.spec
+++ b/.rpm/stackable-agent.spec
@@ -28,6 +28,9 @@ cp -a * %{buildroot}
 
 %post
 systemctl daemon-reload
+mkdir -p /var/lib/stackable/packages
+mkdir -p /var/lib/stackable/config
+mkdir -p /var/lib/stackable/agent/config
 
 %preun
 if [ $1 == 0 ]; then #uninstall

From 764abb482dda7e699f731130d4faac916304ca2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 11 Mar 2021 14:31:10 +0100
Subject: [PATCH 05/20] Removed test trigger to run bild on push to rpm branch.

---
 .github/workflows/nightly.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b828a2b..19450d9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - rpm
 
 env:
   CARGO_TERM_COLOR: always

From 38bde864e25c71de0d8519103b4dcf818716417c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 17:03:29 +0100
Subject: [PATCH 06/20] Ported build code from operators for rpm.

Also changed default paths for a lot of agent directories - this definitely needs calling out in the commit message!

Config file is now empty, as all settings are used with their default values.
---
 .github/workflows/nightly.yml                 | 35 ++++-----
 .rpm/config/agent.conf                        |  5 --
 Cargo.toml                                    | 14 +---
 packaging/buildrpm.sh                         | 75 +++++++++++++++++++
 packaging/debian/postinst                     |  8 +-
 .../systemd/system/stackable-agent.service    | 14 ++++
 src/bin/{agent.rs => stackable-agent.rs}      |  0
 src/config/mod.rs                             | 12 +--
 8 files changed, 114 insertions(+), 49 deletions(-)
 create mode 100755 packaging/buildrpm.sh
 create mode 100644 packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service
 rename src/bin/{agent.rs => stackable-agent.rs} (100%)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 19450d9..af490e5 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - rpm
 
 env:
   CARGO_TERM_COLOR: always
@@ -27,32 +28,22 @@ jobs:
           --data-binary "@./$(find target/debian/ -name *.deb)"
           "https://repo.stackable.tech/repository/deb-nightly/"
 
-  centos7:
-    runs-on: centos7
+  centos:
+    runs-on: centos${{ matrix.node }}
+    strategy:
+      matrix:
+        node: [ 7, 8 ]
     steps:
       - uses: actions/checkout@v2
-      - name: Build rpm package
-        run: ~/.cargo/bin/cargo rpm build -vvvvv
-      - name: Publish rpm package
-        run: >-
-          /usr/bin/curl
-          -vvvv
-          --fail
-          -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
-          "https://repo.stackable.tech/repository/rpm-nightly/el7/"
-
-  centos8:
-    runs-on: centos8
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build rpm package
-        run: ~/.cargo/bin/cargo rpm build -vvvvv
-      - name: Publish rpm package
+      - name: Build
+        run: ~/.cargo/bin/cargo +nightly build --verbose --release
+      - name: Build RPM package
+        run: packaging/buildrpm.sh stackable-agent
+      - name: Publish RPM package
         run: >-
           /usr/bin/curl
           -vvvv
           --fail
           -u 'github:${{ secrets.NEXUS_PASSWORD }}'
-          --upload-file "./$(find  target/release/rpmbuild/RPMS/x86_64/ -name *.rpm)"
-          "https://repo.stackable.tech/repository/rpm-nightly/el8/"
\ No newline at end of file
+          --upload-file "./$(find  target/rpm/RPMS/x86_64/ -name *.rpm)"
+          "https://repo.stackable.tech/repository/rpm-nightly/el${{ matrix.node }}/"
\ No newline at end of file
diff --git a/.rpm/config/agent.conf b/.rpm/config/agent.conf
index 19ae909..e69de29 100644
--- a/.rpm/config/agent.conf
+++ b/.rpm/config/agent.conf
@@ -1,5 +0,0 @@
---package-directory=/var/lib/stackable/packages
---config-directory=/var/lib/stackable/config
---data-directory=/var/lib/stackable/agent
---server-key-file=/var/lib/stackable/agent/config/agent.key
---server-cert-file=/var/lib/stackable/agent/config/agent.crt
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index c150b1d..bb403c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,16 +57,4 @@ systemd-units = { enable = false }
 assets = [
     ["packaging/config/agent.conf", "etc/stackable-agent/", "644"],
     ["target/release/agent", "opt/stackable-agent/stackable-agent", "755"],
-]
-[package.metadata.rpm]
-package = "stackable-agent"
-
-[package.metadata.rpm.cargo]
-buildflags = ["--release"]
-
-[package.metadata.rpm.targets]
-agent = { path = "/opt/stackable-agent/stackable-agent" }
-
-[package.metadata.rpm.files]
-"config/agent.conf" = { path = "/etc/stackable-agent/agent.conf"}
-"systemd/stackable-agent.service" = { path = "/lib/systemd/system/stackable-agent.service"}
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/packaging/buildrpm.sh b/packaging/buildrpm.sh
new file mode 100755
index 0000000..2c4d0ee
--- /dev/null
+++ b/packaging/buildrpm.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+# This script creates an RPM package containing the binary created by this Cargo project.
+# The script is not universally applicable, since it makes a few assumptions about the project structure:
+#  1. The RPM scaffolding needs to be provided in server/packaging/rpm
+#  2. The binary to be packaged needs to be created in target/release
+
+# The script takes one argument, which is the name of the binary that has been created by the build process.
+# This argument will be reused for naming the final RPM file.
+
+# Check if one parameter was specified - we'll use this as the name parameter for all files
+# This allows us to reuse the script across all operators
+if [ -z $1 ]; then
+  echo "This script requires the project name to be specified as the first parameter!"
+  exit 1
+fi
+
+export PACKAGE_NAME=$1
+BINARY_FILE=target/release/$PACKAGE_NAME
+
+# The package description is parsed from the output of `cargo metadata` by using jq.
+# We need to look up the package with a select statement to match the name from an array of packages
+# The name is passed into jq as a jq variable, as no substitution would take place within the single
+# quotes of the jq expression.
+export PACKAGE_DESCRIPTION=$(~/.cargo/bin/cargo metadata --format-version 1| jq --arg NAME "$PACKAGE_NAME" '.packages[] | select(.name == $NAME) | .description')
+if [ -z $PACKAGE_DESCRIPTION ]; then
+  echo "Unable to parse package description from output of `cargo metadata`, cannot build RPM without this field!"
+  exit 2
+fi
+echo
+
+# Check that we are being called from the main directory and the release build process has been run
+if [ ! -f $BINARY_FILE ]; then
+    echo "Binary file not found at [$BINARY_FILE] - this script should be called from the root directory of the repository and 'cargo build --release' needs to have run before calling this script!"
+    exit 3
+fi
+
+echo Cleaning up prior build attempts
+rm -rf target/rpm
+
+# Parse the version and release strings from the PKGID reported by Cargo
+# This is in the form Path#Projectname:version, which we parse by repeated calls to awk with different separators
+# This could most definitely be improved, but works for now
+export VERSION_STRING=$(~/.cargo/bin/cargo pkgid | awk -F'#' '{print $2}' |  awk -F':' '{print $2}')
+echo version: ${VERSION_STRING}
+
+export PACKAGE_VERSION=$(echo ${VERSION_STRING} | awk -F '-' '{print $1}')
+
+# Any suffix like '-nightly' is split out into the release here, as - is not an allowed character in rpm versions
+# The final release will look like 0.suffix or 0 if no suffix is specified.
+export PACKAGE_RELEASE="0$(echo ${VERSION_STRING} | awk -F '-' '{ if ($2 != "") print "."$2;}')"
+
+echo Defined package version: [${PACKAGE_VERSION}]
+echo Defined package release: [${PACKAGE_RELEASE}]
+echo Defined package description: [${PACKAGE_DESCRIPTION}]
+
+echo Creating directory scaffolding for RPM
+cp -r packaging/rpm target/
+# Create empty directory for the binary to be placed into
+mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/opt/stackable/${PACKAGE_NAME}
+
+# Create config directory and copy config file template over
+mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
+cp packaging/config/agent.config target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
+
+# The packaging source directory does not contain the version yet, as this will need to be replaced for every
+# execution. Instead the directory name contains the marker "VERSION" which we now replace with the actual version.
+rename VERSION ${PACKAGE_VERSION} target/rpm/SOURCES/${PACKAGE_NAME}-VERSION
+
+cp target/release/${PACKAGE_NAME} target/rpm/SOURCES/${PACKAGE_NAME}-${PACKAGE_VERSION}/opt/stackable/${PACKAGE_NAME}/
+
+pushd target/rpm/SOURCES
+tar czvf ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz ${PACKAGE_NAME}-${PACKAGE_VERSION}
+popd
+
+rpmbuild --define "_topdir `pwd`/target/rpm" -v -ba target/rpm/SPECS/${PACKAGE_NAME}.spec
diff --git a/packaging/debian/postinst b/packaging/debian/postinst
index 320bab6..291687c 100644
--- a/packaging/debian/postinst
+++ b/packaging/debian/postinst
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-mkdir -p /var/lib/stackable/packages
-mkdir -p /var/lib/stackable/config
-mkdir -p /var/lib/stackable/agent/config
+mkdir -p /opt/stackable/packages
+mkdir -p /var/lib/stackable/agent
+mkdir -p /var/log/stackable/servicelogs
+mkdir -p /etc/stackable/agent
+mkdir -m 700 /etc/stackable/agent/secret
 
 #DEBHELPER#
\ No newline at end of file
diff --git a/packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service b/packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service
new file mode 100644
index 0000000..cf2431a
--- /dev/null
+++ b/packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Stackable Agent
+Before=
+After=network.target
+[Service]
+User=root
+ExecStart=/opt/stackable/agent/stackable-agent
+Restart=on-abort
+StandardOutput=journal
+StandardError=journal
+Environment="CONFIG_FILE=/etc/stackable/agent/agent.conf"
+Environment="RUST_LOG=info"
+[Install]
+WantedBy=multi-user.target
diff --git a/src/bin/agent.rs b/src/bin/stackable-agent.rs
similarity index 100%
rename from src/bin/agent.rs
rename to src/bin/stackable-agent.rs
diff --git a/src/config/mod.rs b/src/config/mod.rs
index b3e684e..cb13e53 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -53,7 +53,7 @@ impl AgentConfig {
 
     pub const DATA_DIR: ConfigOption = ConfigOption {
         name: "data-directory",
-        default: Some("/var/stackable/agent/data"),
+        default: Some("/var/lib/stackable/agent"),
         required: false,
         takes_argument: true,
         help: "The directory where the stackable agent should keep its working data.",
@@ -63,7 +63,7 @@ impl AgentConfig {
 
     pub const BOOTSTRAP_FILE: ConfigOption = ConfigOption {
         name: "bootstrap-file",
-        default: Some("/etc/kubernetes/bootstrap-kubelet.conf"),
+        default: Some("/etc/stackable/agent/bootstrap-kubelet.conf"),
         required: false,
         takes_argument: true,
         help: "The bootstrap file to use in case Kubernetes bootstraping is used to add the agent.",
@@ -83,7 +83,7 @@ impl AgentConfig {
 
     pub const SERVER_CERT_FILE: ConfigOption = ConfigOption {
         name: "server-cert-file",
-        default: None,
+        default: Some("/etc/stackable/agent/secret/agent.crt"),
         required: false,
         takes_argument: true,
         help: "The certificate file for the local webserver which the Krustlet starts.",
@@ -93,7 +93,7 @@ impl AgentConfig {
 
     pub const SERVER_KEY_FILE: ConfigOption = ConfigOption {
         name: "server-key-file",
-        default: None,
+        default: Some("/etc/stackable/agent/secret/agent.key"),
         required: false,
         takes_argument: true,
         help:
@@ -124,7 +124,7 @@ impl AgentConfig {
 
     pub const CONFIG_DIR: ConfigOption = ConfigOption {
         name: "config-directory",
-        default: Some("/opt/stackable/config"),
+        default: Some("/etc/stackable/serviceconfig"),
         required: false,
         takes_argument: true,
         help: "The base directory under which configuration will be generated for all executed services.",
@@ -134,7 +134,7 @@ impl AgentConfig {
 
     pub const LOG_DIR: ConfigOption = ConfigOption {
         name: "log-directory",
-        default: Some("/opt/stackable/logs"),
+        default: Some("/var/log/stackable/servicelogs"),
         required: false,
         takes_argument: true,
         help: "The base directory under which log files will be placed for all services.",

From 7d467f441feeebc6515bb4284c4bc68dbd6877ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 17:13:49 +0100
Subject: [PATCH 07/20] Typo

---
 packaging/buildrpm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/buildrpm.sh b/packaging/buildrpm.sh
index 2c4d0ee..3639534 100755
--- a/packaging/buildrpm.sh
+++ b/packaging/buildrpm.sh
@@ -60,7 +60,7 @@ mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/opt/stackable/${PACKAGE_NAME
 
 # Create config directory and copy config file template over
 mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
-cp packaging/config/agent.config target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
+cp packaging/config/agent.conf target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
 
 # The packaging source directory does not contain the version yet, as this will need to be replaced for every
 # execution. Instead the directory name contains the marker "VERSION" which we now replace with the actual version.

From d46b4e3a23dff73a14ee3424725919989dde8b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 17:20:24 +0100
Subject: [PATCH 08/20] Forgot to commit specfile

---
 packaging/rpm/SPECS/stackable-agent.spec | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 packaging/rpm/SPECS/stackable-agent.spec

diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
new file mode 100644
index 0000000..455d0f4
--- /dev/null
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -0,0 +1,59 @@
+%define __spec_install_post %{nil}
+%define __os_install_post %{_dbpath}/brp-compress
+%define debug_package %{nil}
+%define _servicedir /usr/lib/systemd/system
+%define _version %{getenv:PACKAGE_VERSION}
+%define _release %{getenv:PACKAGE_RELEASE}
+%define _name %{getenv:PACKAGE_NAME}
+%define _bindir /opt/stackable/%{_name}
+%define _description %{getenv:PACKAGE_DESCRIPTION}
+
+Name: %{_name}
+Summary: %{_description}
+Version: %{_version}
+Release: %{_release}%{?dist}
+License: ASL 2.0
+Group: Applications/System
+Source0: %{name}-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+%{summary}
+
+%prep
+%setup -q
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+cp -a * %{buildroot}
+
+%post
+systemctl daemon-reload
+mkdir -p /opt/stackable/packages
+mkdir -p /var/lib/stackable/agent
+mkdir -p /var/log/stackable/servicelogs
+mkdir -p /etc/stackable/agent
+mkdir -m 700 /etc/stackable/agent/secret
+
+%preun
+if [ $1 == 0 ]; then #uninstall
+  systemctl unmask %{name}.service
+  systemctl stop %{name}.service
+  systemctl disable %{name}.service
+fi
+
+%postun
+if [ $1 == 0 ]; then #uninstall
+  systemctl daemon-reload
+  systemctl reset-failed
+fi
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_servicedir}/%{name}.service
\ No newline at end of file

From a31686777e7bd6d303fa125f2e2b9542cee13204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 17:32:10 +0100
Subject: [PATCH 09/20] Directory naming error

---
 .../usr/lib/systemd/system/stackable-agent.service                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packaging/rpm/SOURCES/{stackable-spark-operator-server-VERSION => stackable-agent-VERSION}/usr/lib/systemd/system/stackable-agent.service (100%)

diff --git a/packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service b/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
similarity index 100%
rename from packaging/rpm/SOURCES/stackable-spark-operator-server-VERSION/usr/lib/systemd/system/stackable-agent.service
rename to packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service

From d1ef599dbf112666cfb6ede4d2ff37b7f789f33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 17:38:42 +0100
Subject: [PATCH 10/20] Config File was not specified as managed.

---
 packaging/rpm/SPECS/stackable-agent.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
index 455d0f4..efb913f 100644
--- a/packaging/rpm/SPECS/stackable-agent.spec
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -6,6 +6,7 @@
 %define _release %{getenv:PACKAGE_RELEASE}
 %define _name %{getenv:PACKAGE_NAME}
 %define _bindir /opt/stackable/%{_name}
+%define _confdir /etc/stackable/agent
 %define _description %{getenv:PACKAGE_DESCRIPTION}
 
 Name: %{_name}
@@ -56,4 +57,5 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_servicedir}/%{name}.service
\ No newline at end of file
+%{_servicedir}/%{name}.service
+%{_confdir}/%{name}/agent.conf
\ No newline at end of file

From 04b14e82e6e99e7501b27e66881522d91d2483e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 23:21:06 +0100
Subject: [PATCH 11/20] Typo in conf dir

---
 packaging/rpm/SPECS/stackable-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
index efb913f..65fd74b 100644
--- a/packaging/rpm/SPECS/stackable-agent.spec
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -6,7 +6,7 @@
 %define _release %{getenv:PACKAGE_RELEASE}
 %define _name %{getenv:PACKAGE_NAME}
 %define _bindir /opt/stackable/%{_name}
-%define _confdir /etc/stackable/agent
+%define _confdir /etc/stackable
 %define _description %{getenv:PACKAGE_DESCRIPTION}
 
 Name: %{_name}

From c34972a2bf23c984bbab5e6944edbd87305dd1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Fri, 26 Mar 2021 23:32:02 +0100
Subject: [PATCH 12/20] Fixed name of binary in apt spec

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index bb403c9..0056b71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,5 +56,5 @@ maintainer-scripts = "packaging/debian/"
 systemd-units = { enable = false }
 assets = [
     ["packaging/config/agent.conf", "etc/stackable-agent/", "644"],
-    ["target/release/agent", "opt/stackable-agent/stackable-agent", "755"],
+    ["target/release/stackable-agent", "opt/stackable-agent/stackable-agent", "755"],
 ]
\ No newline at end of file

From f490258f3df59f2cca95af23241ecdf3fdacf00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Mon, 29 Mar 2021 15:38:22 +0200
Subject: [PATCH 13/20] Fixed service file for debian, config path was not
 adjusted in here.

---
 packaging/debian/service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/debian/service b/packaging/debian/service
index 1825efa..0dd339b 100644
--- a/packaging/debian/service
+++ b/packaging/debian/service
@@ -8,7 +8,7 @@ ExecStart=/opt/stackable-agent/stackable-agent
 Restart=on-abort
 StandardOutput=journal
 StandardError=journal
-Environment="CONFIG_FILE=/etc/stackable-agent/agent.conf"
+Environment="CONFIG_FILE=/etc/stackable/agent/agent.conf"
 Environment="RUST_LOG=info"
 [Install]
 WantedBy=multi-user.target

From 0fd8252a31f016c203dcb175a74c4486ee00a698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Mon, 29 Mar 2021 16:06:04 +0200
Subject: [PATCH 14/20] Fixed a mixture of errors in config paths.

---
 Cargo.toml                                               | 2 +-
 packaging/config/agent.conf                              | 5 -----
 packaging/debian/postinst                                | 6 +++---
 packaging/debian/service                                 | 2 +-
 .../usr/lib/systemd/system/stackable-agent.service       | 2 +-
 packaging/rpm/SPECS/stackable-agent.spec                 | 9 +++++----
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0056b71..f95b019 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,6 +55,6 @@ codegen-units = 1
 maintainer-scripts = "packaging/debian/"
 systemd-units = { enable = false }
 assets = [
-    ["packaging/config/agent.conf", "etc/stackable-agent/", "644"],
+    ["packaging/config/agent.conf", "etc/stackable/stackable-agent/", "644"],
     ["target/release/stackable-agent", "opt/stackable-agent/stackable-agent", "755"],
 ]
\ No newline at end of file
diff --git a/packaging/config/agent.conf b/packaging/config/agent.conf
index 19ae909..e69de29 100644
--- a/packaging/config/agent.conf
+++ b/packaging/config/agent.conf
@@ -1,5 +0,0 @@
---package-directory=/var/lib/stackable/packages
---config-directory=/var/lib/stackable/config
---data-directory=/var/lib/stackable/agent
---server-key-file=/var/lib/stackable/agent/config/agent.key
---server-cert-file=/var/lib/stackable/agent/config/agent.crt
\ No newline at end of file
diff --git a/packaging/debian/postinst b/packaging/debian/postinst
index 291687c..1a9628c 100644
--- a/packaging/debian/postinst
+++ b/packaging/debian/postinst
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 mkdir -p /opt/stackable/packages
-mkdir -p /var/lib/stackable/agent
+mkdir -p /var/lib/stackable/stackable-agent
 mkdir -p /var/log/stackable/servicelogs
-mkdir -p /etc/stackable/agent
-mkdir -m 700 /etc/stackable/agent/secret
+mkdir -p /etc/stackable/stackable-agent
+mkdir -m 700 /etc/stackable/stackable-agent/secret
 
 #DEBHELPER#
\ No newline at end of file
diff --git a/packaging/debian/service b/packaging/debian/service
index 0dd339b..d80fa43 100644
--- a/packaging/debian/service
+++ b/packaging/debian/service
@@ -8,7 +8,7 @@ ExecStart=/opt/stackable-agent/stackable-agent
 Restart=on-abort
 StandardOutput=journal
 StandardError=journal
-Environment="CONFIG_FILE=/etc/stackable/agent/agent.conf"
+Environment="CONFIG_FILE=/etc/stackable/stackable-agent/agent.conf"
 Environment="RUST_LOG=info"
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service b/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
index cf2431a..300f942 100644
--- a/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
+++ b/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
@@ -8,7 +8,7 @@ ExecStart=/opt/stackable/agent/stackable-agent
 Restart=on-abort
 StandardOutput=journal
 StandardError=journal
-Environment="CONFIG_FILE=/etc/stackable/agent/agent.conf"
+Environment="CONFIG_FILE=/etc/stackable/stackable-agent/agent.conf"
 Environment="RUST_LOG=info"
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
index 65fd74b..29d1a79 100644
--- a/packaging/rpm/SPECS/stackable-agent.spec
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -6,7 +6,8 @@
 %define _release %{getenv:PACKAGE_RELEASE}
 %define _name %{getenv:PACKAGE_NAME}
 %define _bindir /opt/stackable/%{_name}
-%define _confdir /etc/stackable
+%define _confdir /etc/stackable/%{_name}
+%define _vardir /var/lib/stackable/%{_name}
 %define _description %{getenv:PACKAGE_DESCRIPTION}
 
 Name: %{_name}
@@ -33,10 +34,10 @@ cp -a * %{buildroot}
 %post
 systemctl daemon-reload
 mkdir -p /opt/stackable/packages
-mkdir -p /var/lib/stackable/agent
+mkdir -p %{_vardir}
 mkdir -p /var/log/stackable/servicelogs
-mkdir -p /etc/stackable/agent
-mkdir -m 700 /etc/stackable/agent/secret
+mkdir -p %{_confdir}
+mkdir -m 700 %{_confdir}/secret
 
 %preun
 if [ $1 == 0 ]; then #uninstall

From 69354cf62eb2315f65547728d7c4e8012ce2db46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Mon, 29 Mar 2021 16:28:32 +0200
Subject: [PATCH 15/20] Duplication in path

---
 packaging/rpm/SPECS/stackable-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
index 29d1a79..6c27791 100644
--- a/packaging/rpm/SPECS/stackable-agent.spec
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -59,4 +59,4 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_servicedir}/%{name}.service
-%{_confdir}/%{name}/agent.conf
\ No newline at end of file
+%{_confdir}/agent.conf
\ No newline at end of file

From 52a9c8ba12c505b74c09dfc8616377d2da078bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Mon, 29 Mar 2021 16:45:30 +0200
Subject: [PATCH 16/20] Changed default value for tls files path

---
 src/config/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/mod.rs b/src/config/mod.rs
index cb13e53..38d69b8 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -63,7 +63,7 @@ impl AgentConfig {
 
     pub const BOOTSTRAP_FILE: ConfigOption = ConfigOption {
         name: "bootstrap-file",
-        default: Some("/etc/stackable/agent/bootstrap-kubelet.conf"),
+        default: Some("/etc/stackable/stackable-agent/bootstrap-kubelet.conf"),
         required: false,
         takes_argument: true,
         help: "The bootstrap file to use in case Kubernetes bootstraping is used to add the agent.",
@@ -83,7 +83,7 @@ impl AgentConfig {
 
     pub const SERVER_CERT_FILE: ConfigOption = ConfigOption {
         name: "server-cert-file",
-        default: Some("/etc/stackable/agent/secret/agent.crt"),
+        default: Some("/etc/stackable/stackable-agent/secret/agent.crt"),
         required: false,
         takes_argument: true,
         help: "The certificate file for the local webserver which the Krustlet starts.",
@@ -93,7 +93,7 @@ impl AgentConfig {
 
     pub const SERVER_KEY_FILE: ConfigOption = ConfigOption {
         name: "server-key-file",
-        default: Some("/etc/stackable/agent/secret/agent.key"),
+        default: Some("/etc/stackable/stackable-agent/secret/agent.key"),
         required: false,
         takes_argument: true,
         help:

From 594fbeb042fbdc2a40f5a16e22d74b11f8572323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Mon, 29 Mar 2021 17:09:38 +0200
Subject: [PATCH 17/20] Fixed path

---
 .../usr/lib/systemd/system/stackable-agent.service              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service b/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
index 300f942..0549d4b 100644
--- a/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
+++ b/packaging/rpm/SOURCES/stackable-agent-VERSION/usr/lib/systemd/system/stackable-agent.service
@@ -4,7 +4,7 @@ Before=
 After=network.target
 [Service]
 User=root
-ExecStart=/opt/stackable/agent/stackable-agent
+ExecStart=/opt/stackable/stackable-agent/stackable-agent
 Restart=on-abort
 StandardOutput=journal
 StandardError=journal

From 81c9c2680175041a77ce6ac4bb41ec35033a0ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Tue, 30 Mar 2021 09:28:34 +0200
Subject: [PATCH 18/20] Removed running build on rpm branch in preparation for
 merging

---
 .github/workflows/nightly.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index af490e5..314fae8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - rpm
 
 env:
   CARGO_TERM_COLOR: always

From 5beafafbfb6431465ca4d44c35692506ae0d7f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Tue, 30 Mar 2021 10:32:29 +0200
Subject: [PATCH 19/20] Regenerated command line parameter docs.

---
 documentation/commandline_args.adoc | 117 +++++++++++++++++-----------
 1 file changed, 71 insertions(+), 46 deletions(-)

diff --git a/documentation/commandline_args.adoc b/documentation/commandline_args.adoc
index 7e64ec3..54c7c07 100644
--- a/documentation/commandline_args.adoc
+++ b/documentation/commandline_args.adoc
@@ -1,7 +1,7 @@
 
 
 
-=== server-cert-file
+=== no-config
 
 *Default value*: `No default value`
 
@@ -10,60 +10,78 @@
 *Multiple values:* false
 
 
-The certificate file for the local webserver which the Krustlet starts.
+If this option is specified, any file referenced in AGENT_CONF environment variable will be ignored.
 
 
-=== server-port
+=== pod-cidr
 
-*Default value*: `3000`
+*Default value*: ``
 
 *Required*: false
 
 *Multiple values:* false
 
 
-Port to listen on for callbacks.
+This setting controls the pod address range that the agent reports to Kubernetes.
+The effect of this setting is that Kubernetes will reserve address blocks from withhin this range for every node.
+Depending on the setting for maximum pods per node, these will be larger or smaller ranges, and influence the maximum number of nodes for the cluster.
 
+The agent does not require any pod address ranges, and by default doesn't specify anything for this setting.
 
-=== package-directory
+WARNING: There should almost never be a reason to use this setting, this is mostly here for very special circumstances. Do not touch it unless you really know what you're doing.
 
-*Default value*: `/opt/stackable/packages`
+
+=== bootstrap-file
+
+*Default value*: `/etc/stackable/stackable-agent/bootstrap-kubelet.conf`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-This directory will serve as starting point for packages that are needed by pods assigned to this node.\n Packages will be downloaded into the "_download" folder at the top level of this folder as archives and remain there for potential future use.
+The bootstrap file to use in case Kubernetes bootstraping is used to add the agent.
 
-Archives will the be extracted directly into this folder in subdirectories following the naming
-scheme of "productname-productversion".
 
-The agent will need full access to this directory and tries to create it if it does not exist.
+=== server-bind-ip
 
+*Default value*: `No default value`
 
-=== data-directory
+*Required*: false
+
+*Multiple values:* false
+
+
+The local IP to register as the node's ip with the apiserver. Will be automatically set to the first address of the first non-loopback interface if not specified.
+
+
+=== server-key-file
 
-*Default value*: `/var/stackable/agent/data`
+*Default value*: `/etc/stackable/stackable-agent/secret/agent.key`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-The directory where the stackable agent should keep its working data.
+Private key file (in PKCS8 format) to use for the local webserver the Krustlet starts.
 
 
-=== no-config
+=== package-directory
 
-*Default value*: `No default value`
+*Default value*: `/opt/stackable/packages`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-If this option is specified, any file referenced in AGENT_CONF environment variable will be ignored.
+This directory will serve as starting point for packages that are needed by pods assigned to this node.\n Packages will be downloaded into the "_download" folder at the top level of this folder as archives and remain there for potential future use.
+
+Archives will the be extracted directly into this folder in subdirectories following the naming
+scheme of "productname-productversion".
+
+The agent will need full access to this directory and tries to create it if it does not exist.
 
 
 === hostname
@@ -78,49 +96,45 @@ If this option is specified, any file referenced in AGENT_CONF environment varia
 The hostname to register the node under in Kubernetes - defaults to system hostname.
 
 
-=== pod-cidr
+=== data-directory
 
-*Default value*: ``
+*Default value*: `/var/lib/stackable/agent`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-This setting controls the pod address range that the agent reports to Kubernetes.
-The effect of this setting is that Kubernetes will reserve address blocks from withhin this range for every node.
-Depending on the setting for maximum pods per node, these will be larger or smaller ranges, and influence the maximum number of nodes for the cluster.
-
-The agent does not require any pod address ranges, and by default doesn't specify anything for this setting.
+The directory where the stackable agent should keep its working data.
 
 
-=== server-key-file
+=== server-cert-file
 
-*Default value*: `No default value`
+*Default value*: `/etc/stackable/stackable-agent/secret/agent.crt`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-Private key file (in PKCS8 format) to use for the local webserver the Krustlet starts.
+The certificate file for the local webserver which the Krustlet starts.
 
 
-=== server-bind-ip
+=== server-port
 
-*Default value*: `No default value`
+*Default value*: `3000`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-The local IP to register as the node's ip with the apiserver. Will be automatically set to the first address of the first non-loopback interface if not specified.
+Port to listen on for callbacks.
 
 
 === config-directory
 
-*Default value*: `/opt/stackable/config`
+*Default value*: `/etc/stackable/serviceconfig`
 
 *Required*: false
 
@@ -140,43 +154,54 @@ WARNING: This allows anybody who can specify pods more or less full access to th
 The agent will need full access to this directory and tries to create it if it does not exist.
 
 
-=== tag
+=== log-directory
 
-*Default value*: `No default value`
+*Default value*: `/var/log/stackable/servicelogs`
 
 *Required*: false
 
-*Multiple values:* true
+*Multiple values:* false
 
 
-A "key=value" pair that should be assigned to this agent as tag. This can be specified multiple times to assign additional tags.
+This directory will serve as starting point for all log files which this service creates.
+Every service will get its own subdirectory created within this directory.
+Anything that is then specified in the log4j config or similar files will be resolved relatively to this directory.
 
-Tags are the main way of identifying nodes to assign services to later on.
+The agent will need full access to this directory and tries to create it if it does not exist.
 
 
-=== log-directory
+=== session
 
-*Default value*: `/opt/stackable/logs`
+*Default value*: `No default value`
 
 *Required*: false
 
 *Multiple values:* false
 
 
-This directory will serve as starting point for all log files which this service creates.
-Every service will get its own subdirectory created within this directory.
-Anything that is then specified in the log4j config or similar files will be resolved relatively to this directory.
+This parameter specifies whether to use a session or the system DBus connection when talking to systemd.
+For our purposps the difference between the two can be explained as the session bus being restricted to the current user, whereas the system bus rolls out services that are available for every user.
+In reality is is a bit more involved than that, please refer to the https://dbus.freedesktop.org/doc/dbus-specification.html[official docs] for more information.
 
-The agent will need full access to this directory and tries to create it if it does not exist.
+When this flag is specified it causes symlinks for loaded services to be created in the currently active users systemd directory `~/.config/systemd/user` instead of one of the globally valid locations:
 
+- `/lib/systemd/system`
+- `/etc/systemd/system`
 
-=== bootstrap-file
+The default is to use the system bus, for which it is necessary that the agent either run as root or have passwordless sudo rights.
+
+Using the session bus will mainly be useful for scenarios without root access and for testing on developer machines.
 
-*Default value*: `/etc/kubernetes/bootstrap-kubelet.conf`
+
+=== tag
+
+*Default value*: `No default value`
 
 *Required*: false
 
-*Multiple values:* false
+*Multiple values:* true
 
 
-The bootstrap file to use in case Kubernetes bootstraping is used to add the agent.
\ No newline at end of file
+A "key=value" pair that should be assigned to this agent as tag. This can be specified multiple times to assign additional tags.
+
+Tags are the main way of identifying nodes to assign services to later on.
\ No newline at end of file

From 902e6c0fd3e0ae15c821673cc912dc532ae41f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <soenke.liebau@gmail.com>
Date: Thu, 1 Apr 2021 12:27:12 +0200
Subject: [PATCH 20/20] Adressed comments from Lars.

---
 .rpm/config/agent.conf               |  0
 .rpm/stackable-agent.spec            | 57 ----------------------------
 .rpm/systemd/stackable-agent.service | 14 -------
 packaging/buildrpm.sh                |  2 +-
 4 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 .rpm/config/agent.conf
 delete mode 100644 .rpm/stackable-agent.spec
 delete mode 100644 .rpm/systemd/stackable-agent.service

diff --git a/.rpm/config/agent.conf b/.rpm/config/agent.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/.rpm/stackable-agent.spec b/.rpm/stackable-agent.spec
deleted file mode 100644
index 73dbcbc..0000000
--- a/.rpm/stackable-agent.spec
+++ /dev/null
@@ -1,57 +0,0 @@
-%define __spec_install_post %{nil}
-%define __os_install_post %{_dbpath}/brp-compress
-%define debug_package %{nil}
-%define _bindir /opt/stackable-agent
-%define _confdir /etc/stackable-agent
-%define _systemdir /lib/systemd/system
-
-Name: stackable-agent
-Summary: Tha component of the Stackable Platform that manages installation of services on the workers
-Version: @@VERSION@@
-Release: @@RELEASE@@%{?dist}
-License: ASL 2.0
-Group: Applications/System
-Source0: %{name}-%{version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%description
-%{summary}
-
-%prep
-%setup -q
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
-cp -a * %{buildroot}
-
-%post
-systemctl daemon-reload
-mkdir -p /var/lib/stackable/packages
-mkdir -p /var/lib/stackable/config
-mkdir -p /var/lib/stackable/agent/config
-
-%preun
-if [ $1 == 0 ]; then #uninstall
-  systemctl unmask %{name}.service
-  systemctl stop %{name}.service
-  systemctl disable %{name}.service
-fi
-
-%postun
-if [ $1 == 0 ]; then #uninstall
-  systemctl daemon-reload
-  systemctl reset-failed
-fi
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_confdir}/*
-%{_systemdir}/%{name}.service
-
-
diff --git a/.rpm/systemd/stackable-agent.service b/.rpm/systemd/stackable-agent.service
deleted file mode 100644
index 1825efa..0000000
--- a/.rpm/systemd/stackable-agent.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Stackable Agent
-Before=
-After=network.target
-[Service]
-User=root
-ExecStart=/opt/stackable-agent/stackable-agent
-Restart=on-abort
-StandardOutput=journal
-StandardError=journal
-Environment="CONFIG_FILE=/etc/stackable-agent/agent.conf"
-Environment="RUST_LOG=info"
-[Install]
-WantedBy=multi-user.target
diff --git a/packaging/buildrpm.sh b/packaging/buildrpm.sh
index 3639534..00d427a 100755
--- a/packaging/buildrpm.sh
+++ b/packaging/buildrpm.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # This script creates an RPM package containing the binary created by this Cargo project.
 # The script is not universally applicable, since it makes a few assumptions about the project structure:
-#  1. The RPM scaffolding needs to be provided in server/packaging/rpm
+#  1. The RPM scaffolding needs to be provided in packaging/rpm
 #  2. The binary to be packaged needs to be created in target/release
 
 # The script takes one argument, which is the name of the binary that has been created by the build process.