chore(release): update package version to 0.0.8

feat(config): add restart options for unit configuration
* include Restart, RestartSec, and RestartRetries fields * update service file generation to support restart settings * add tests for restart behavior in unit generation
2026-04-10 09:38:59 +02:00 · 2026-04-10 09:38:45 +02:00 · 2026-04-08 19:59:11 +02:00 · 2026-04-08 19:59:00 +02:00 · 2026-04-08 19:48:22 +02:00 · 2026-04-08 19:48:07 +02:00
15 changed files with 305 additions and 161 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
            [ "$GOOS" = "windows" ] && EXT=".exe"
            NAME="unitdore-${GOOS}-${GOARCH}${EXT}"
            GOOS="$GOOS" GOARCH="$GOARCH" go build \
-              -ldflags "-X main.version=${VERSION}" \
+              -ldflags "-X github.com/warkanum/unitdore/cmd.version=${VERSION}" \
              -o "$NAME" .
            echo "Built $NAME"
          done
@@ -92,62 +92,6 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  pkg-arch:
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build Arch package
-        run: |
-          VERSION="${{ github.event.inputs.tag || github.ref_name }}"
-          PKGVER="${VERSION#v}"
-
-          # Source archive — prefix=unitdore-vVERSION/ matches `cd "$pkgname-v$pkgver"` in PKGBUILD
-          git archive --format=zip --prefix=unitdore-v${PKGVER}/ HEAD \
-            > pkg/arch/unitdore-${PKGVER}.zip
-          SHA=$(sha256sum pkg/arch/unitdore-${PKGVER}.zip | cut -d' ' -f1)
-
-          # Patch PKGBUILD for local build
-          sed -i \
-            -e "s/^pkgver=.*/pkgver=${PKGVER}/" \
-            -e "s/^sha256sums=.*/sha256sums=('${SHA}')/" \
-            -e "s|source=.*|source=(\"unitdore-\${pkgver}.zip\")|" \
-            pkg/arch/PKGBUILD
-
-          mkdir -p pkg/arch/out
-          docker run --rm \
-            -v "$PWD/pkg/arch:/build" \
-            -v "$PWD/pkg/arch/out:/out" \
-            -w /build \
-            archlinux:latest \
-            bash -c "
-              pacman -Syu --noconfirm base-devel go &&
-              useradd -m builder &&
-              chown -R builder:builder /build &&
-              runuser -u builder -- bash -c 'cd /build && makepkg --noconfirm --noprogressbar' &&
-              cp /build/*.pkg.tar.zst /out/
-            "
-
-      - name: Upload to release
-        run: |
-          TAG="${{ github.event.inputs.tag || github.ref_name }}"
-          RELEASE=$(curl -s "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${TAG}" \
-            -H "Authorization: token ${GITHUB_TOKEN}")
-          UPLOAD_URL=$(echo "$RELEASE" | grep -o '"upload_url":"[^"]*"' | cut -d'"' -f4)
-          for f in pkg/arch/out/*.pkg.tar.zst; do
-            FNAME=$(basename "$f")
-            echo "Uploading $FNAME..."
-            curl -s -X POST "${UPLOAD_URL}?name=${FNAME}" \
-              -H "Authorization: token ${GITHUB_TOKEN}" \
-              -H "Content-Type: application/octet-stream" \
-              --data-binary "@${f}" > /dev/null
-          done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
  pkg-aur:
    needs: release
    runs-on: ubuntu-latest
@@ -158,46 +102,98 @@ jobs:
        env:
          AUR_SSH_KEY: ${{ secrets.AUR_SSH_KEY }}
        run: |
+          set -euo pipefail
+
          VERSION="${{ github.event.inputs.tag || github.ref_name }}"
          PKGVER="${VERSION#v}"
+          AUR_KEY_PATH="$HOME/.ssh/aur"
+          AUR_KNOWN_HOSTS="$HOME/.ssh/known_hosts"

          # Setup SSH for AUR
          mkdir -p ~/.ssh
-          echo "$AUR_SSH_KEY" > ~/.ssh/aur
-          chmod 600 ~/.ssh/aur
-          ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts
+          chmod 700 ~/.ssh
+
+          if [ -z "${AUR_SSH_KEY:-}" ]; then
+            echo "AUR_SSH_KEY is empty"
+            exit 1
+          fi
+
+          # Support raw multiline keys, escaped \\n secrets, or base64-encoded keys.
+          CLEAN_AUR_SSH_KEY="$(printf '%s' "$AUR_SSH_KEY" | tr -d '\r')"
+          if printf '%s' "$CLEAN_AUR_SSH_KEY" | grep -q "^-----BEGIN .*PRIVATE KEY-----$"; then
+            printf '%s\n' "$CLEAN_AUR_SSH_KEY" > "$AUR_KEY_PATH"
+          elif printf '%s' "$CLEAN_AUR_SSH_KEY" | grep -q '\\n'; then
+            printf '%b\n' "$CLEAN_AUR_SSH_KEY" > "$AUR_KEY_PATH"
+          else
+            if printf '%s' "$CLEAN_AUR_SSH_KEY" | tr -d '[:space:]' | base64 --decode > "$AUR_KEY_PATH" 2>/dev/null; then
+              :
+            else
+              printf '%s\n' "$CLEAN_AUR_SSH_KEY" > "$AUR_KEY_PATH"
+            fi
+          fi
+          chmod 600 "$AUR_KEY_PATH"
+
+          if ! ssh-keygen -y -f "$AUR_KEY_PATH" >/dev/null 2>&1; then
+            echo "AUR_SSH_KEY is not a valid private key."
+            echo "Store it as a raw private key, an escaped private key with \\n, or a base64-encoded private key."
+            exit 1
+          fi
+
+          ssh-keyscan -t rsa,ed25519 aur.archlinux.org >> "$AUR_KNOWN_HOSTS"
+          chmod 644 "$AUR_KNOWN_HOSTS"

          # Clone AUR repo
-          GIT_SSH_COMMAND="ssh -i ~/.ssh/aur" git clone ssh://aur@aur.archlinux.org/unitdore.git aur-repo
+          GIT_SSH_COMMAND="ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=$AUR_KNOWN_HOSTS -i $AUR_KEY_PATH" \
+            git clone ssh://aur@aur.archlinux.org/unitdore.git aur-repo

-          # Compute SHA256 of the release tarball (same URL the PKGBUILD will download)
+          CURRENT_PKGVER=$(awk -F= '/^pkgver=/ {print $2; exit}' aur-repo/PKGBUILD | tr -d "[:space:]")
+          CURRENT_PKGREL=$(awk -F= '/^pkgrel=/ {print $2; exit}' aur-repo/PKGBUILD | tr -d "[:space:]")
+
+          if [ "$CURRENT_PKGVER" = "$PKGVER" ]; then
+            case "$CURRENT_PKGREL" in
+              ''|*[!0-9]*)
+                echo "Unsupported pkgrel in AUR repo: ${CURRENT_PKGREL}"
+                exit 1
+                ;;
+              *)
+                PKGREL=$((CURRENT_PKGREL + 1))
+                ;;
+            esac
+          else
+            PKGREL=1
+          fi
+
+          echo "Publishing AUR package version ${PKGVER}-${PKGREL}"
+
+          # Compute SHA256 of the source archive from the same URL the PKGBUILD will download.
          SHA=$(curl -fsSL "https://git.warky.dev/wdevs/unitdore/archive/v${PKGVER}.zip" | sha256sum | cut -d' ' -f1)

-          # Update PKGBUILD — keep remote source URL, only bump version and checksum
+          # Update PKGBUILD — keep remote source URL, bump version/checksum, and increment pkgrel for same-version rebuilds.
          sed -e "s/^pkgver=.*/pkgver=${PKGVER}/" \
-              -e "s/^pkgrel=.*/pkgrel=1/" \
+              -e "s/^pkgrel=.*/pkgrel=${PKGREL}/" \
              -e "s/^sha256sums=.*/sha256sums=('${SHA}')/" \
              pkg/arch/PKGBUILD > aur-repo/PKGBUILD

-          # Generate .SRCINFO inside an Arch container
-          docker run --rm \
-            -v "$PWD/aur-repo:/build" \
-            -w /build \
-            archlinux:latest \
-            bash -c "
-              pacman -Sy --noconfirm base-devel &&
-              useradd -m builder &&
-              chown -R builder:builder /build &&
-              runuser -u builder -- bash -c 'cd /build && makepkg --printsrcinfo > .SRCINFO'
-            "
+          # Generate .SRCINFO inside an Arch container (docker cp avoids DinD volume mount issues)
+          CID=$(docker run -d archlinux:latest sleep infinity)
+          docker cp aur-repo/PKGBUILD $CID:/build/PKGBUILD || (docker exec $CID mkdir -p /build && docker cp aur-repo/PKGBUILD $CID:/build/PKGBUILD)
+          docker exec $CID bash -c "
+            pacman -Sy --noconfirm base-devel &&
+            useradd -m builder &&
+            chown -R builder:builder /build &&
+            runuser -u builder -- bash -c 'cd /build && makepkg --printsrcinfo > .SRCINFO'
+          "
+          docker cp $CID:/build/.SRCINFO aur-repo/.SRCINFO
+          docker rm -f $CID

          # Commit and push to AUR master
          cd aur-repo
          git config user.email "hein@warky.dev"
          git config user.name "Hein"
          git add PKGBUILD .SRCINFO
-          git commit -m "Update to v${PKGVER}"
-          GIT_SSH_COMMAND="ssh -i ~/.ssh/aur" git push origin HEAD:master
+          git commit -m "Update to v${PKGVER}-${PKGREL}"
+          GIT_SSH_COMMAND="ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=$AUR_KNOWN_HOSTS -i $AUR_KEY_PATH" \
+            git push origin HEAD:master

  pkg-deb:
    needs: release
@@ -219,7 +215,7 @@ jobs:
          for GOARCH in amd64 arm64; do
            GOOS=linux GOARCH=$GOARCH go build \
              -trimpath \
-              -ldflags "-X main.version=${PKGVER}" \
+              -ldflags "-X github.com/warkanum/unitdore/cmd.version=${PKGVER}" \
              -o unitdore .

            PKGDIR="unitdore_${PKGVER}_${GOARCH}"
@@ -266,8 +262,16 @@ jobs:

      - name: Build RPM
        run: |
+          set -euo pipefail
+
          VERSION="${{ github.event.inputs.tag || github.ref_name }}"
          PKGVER="${VERSION#v}"
+          GO_VER="$(awk '/^go / { print $2; exit }' go.mod)"
+
+          if [ -z "${GO_VER}" ]; then
+            echo "Failed to determine Go version from go.mod"
+            exit 1
+          fi

          # Source tarball — prefix=unitdore-VERSION/ matches RPM %autosetup convention
          git archive --format=tar.gz --prefix=unitdore-${PKGVER}/ HEAD \
@@ -277,22 +281,37 @@ jobs:
          sed -i "s/^Version:.*/Version:        ${PKGVER}/" pkg/centos/unitdore.spec

          mkdir -p pkg/centos/out
-          docker run --rm \
-            -v "$PWD:/workspace" \
-            -v "$PWD/pkg/centos/out:/out" \
-            -w /workspace \
+          CID=$(docker create \
+            -e GO_VER="${GO_VER}" \
+            -e PKGVER="${PKGVER}" \
+            -w /build \
            rockylinux:9 \
-            bash -c "
-              dnf install -y rpm-build git curl &&
-              GO_VER=\$(grep '^go ' /workspace/go.mod | awk '{print \$2}') &&
+            bash -lc "
+              set -euo pipefail
+              # Rocky 9 images already ship curl-minimal, which is enough for the Go tarball download.
+              dnf install -y rpm-build git &&
              curl -fsSL https://go.dev/dl/go\${GO_VER}.linux-amd64.tar.gz | tar -C /usr/local -xz &&
              export PATH=\$PATH:/usr/local/go/bin &&
              mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} &&
              cp unitdore-${PKGVER}.tar.gz ~/rpmbuild/SOURCES/ &&
              cp pkg/centos/unitdore.spec ~/rpmbuild/SPECS/ &&
-              rpmbuild --nodeps -ba ~/rpmbuild/SPECS/unitdore.spec &&
-              find ~/rpmbuild/RPMS -name '*.rpm' -exec cp {} /out/ \;
-            "
+              rpmbuild --nodeps -ba ~/rpmbuild/SPECS/unitdore.spec
+            ")
+
+          cleanup() {
+            docker rm -f "$CID" >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+
+          # Avoid bind mounts here because DinD runners may not expose the checkout path to the Docker daemon.
+          docker cp unitdore-${PKGVER}.tar.gz "$CID:/build/unitdore-${PKGVER}.tar.gz"
+          docker cp pkg "$CID:/build/pkg"
+
+          docker start -a "$CID"
+          docker cp "$CID:/root/rpmbuild/RPMS/." pkg/centos/out/
+
+          trap - EXIT
+          cleanup

      - name: Upload to release
        run: |
@@ -300,13 +319,13 @@ jobs:
          RELEASE=$(curl -s "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${TAG}" \
            -H "Authorization: token ${GITHUB_TOKEN}")
          UPLOAD_URL=$(echo "$RELEASE" | grep -o '"upload_url":"[^"]*"' | cut -d'"' -f4)
-          for f in pkg/centos/out/*.rpm; do
+          while IFS= read -r f; do
            FNAME=$(basename "$f")
            echo "Uploading $FNAME..."
            curl -s -X POST "${UPLOAD_URL}?name=${FNAME}" \
              -H "Authorization: token ${GITHUB_TOKEN}" \
              -H "Content-Type: application/octet-stream" \
              --data-binary "@${f}" > /dev/null
-          done
+          done < <(find pkg/centos/out -name "*.rpm")
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 unitdore
 *.exe
+.codex
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Hein (Warky Devs)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/16
+++ b/16
@@ -1,8 +1,8 @@
 BINARY     := unitdore
-INSTALL_DIR := /usr/local/bin
+INSTALL_DIR := /usr/bin
 CONFIG_DIR  := /etc/unitdore
 VERSION    := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
-LDFLAGS    := -ldflags "-X main.version=$(VERSION)"
+LDFLAGS    := -ldflags "-X github.com/warkanum/unitdore/cmd.version=$(VERSION)"

 .PHONY: all build install uninstall test lint clean release-version

@@ -42,17 +42,23 @@ lint:
 clean:
 	rm -f $(BINARY)

-## release-version: bump patch version, tag, and push to trigger release workflow
+## release-version: bump patch version, update source versions, commit, tag, and push
 release-version:
 	@CURRENT=$$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0"); \
 	MAJOR=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'); \
 	MINOR=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'); \
 	PATCH=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'); \
 	NEXT="v$$MAJOR.$$MINOR.$$((PATCH + 1))"; \
+	PKGVER="$$MAJOR.$$MINOR.$$((PATCH + 1))"; \
 	echo "Current: $$CURRENT → Next: $$NEXT"; \
+	sed -i "s/^var version = .*/var version = \"$$PKGVER\"/" cmd/root.go; \
+	sed -i "s/^pkgver=.*/pkgver=$$PKGVER/" pkg/arch/PKGBUILD; \
+	sed -i "s/^Version:.*/Version:        $$PKGVER/" pkg/centos/unitdore.spec; \
+	git add cmd/root.go pkg/arch/PKGBUILD pkg/centos/unitdore.spec; \
+	git commit -m "chore(release): update package version to $$PKGVER"; \
 	git tag -a "$$NEXT" -m "Release $$NEXT"; \
-	git push origin "$$NEXT"; \
-	echo "Pushed tag $$NEXT — release workflow triggered"
+	git push origin HEAD "$$NEXT"; \
+	echo "Pushed $$NEXT — release workflow triggered"

 ## help: show this help
 help:
--- a/README.md
+++ b/README.md
@@ -6,6 +6,32 @@ Unitdore bridges your container runtime (Podman, Docker) and systemd. It discove

 ## Install

+**Arch Linux (AUR)**
+
+```bash
+yay -S unitdore
+```
+
+**Debian / Ubuntu**
+
+Download the `.deb` from the [releases page](https://git.warky.dev/wdevs/unitdore/releases) and install:
+
+```bash
+sudo dpkg -i unitdore_*.deb
+```
+
+**CentOS / AlmaLinux / Rocky Linux**
+
+Download the `.rpm` from the [releases page](https://git.warky.dev/wdevs/unitdore/releases) and install:
+
+```bash
+sudo rpm -i unitdore-*.rpm
+# or with dnf:
+sudo dnf install unitdore-*.rpm
+```
+
+**From source**
+
 ```bash
 make build
 sudo make install
--- a/cmd/install.go
+++ b/cmd/install.go
@@ -31,7 +31,7 @@ func runInstall(cmd *cobra.Command, args []string) error {
 		return err
 	}

-	prefix, suffix, serviceUser := cfg.Prefix, cfg.Suffix, cfg.EffectiveServiceUser()
+	prefix, suffix := cfg.Prefix, cfg.Suffix
 	installed := 0
 	skipped := 0
 	removed := 0
@@ -57,7 +57,7 @@ func runInstall(cmd *cobra.Command, args []string) error {
 		}

 		if dryRun {
-			content, err := systemd.Generate(u, prefix, suffix, serviceUser)
+			content, err := systemd.Generate(u, prefix, suffix)
 			if err != nil {
 				fmt.Printf("  ✗ %s: %v\n", u.Name, err)
 				continue
@@ -68,7 +68,7 @@ func runInstall(cmd *cobra.Command, args []string) error {
 			continue
 		}

-		if err := systemd.Install(u, prefix, suffix, serviceUser); err != nil {
+		if err := systemd.Install(u, prefix, suffix); err != nil {
 			fmt.Printf("  ✗ failed: %s: %v\n", u.Name, err)
 		} else {
 			path, _ := systemd.UnitPath(u, prefix, suffix)
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -7,6 +7,8 @@ import (
 	"github.com/spf13/cobra"
 )

+var version = "0.0.8"
+
 var configPath string

 var rootCmd = &cobra.Command{
@@ -16,7 +18,7 @@ var rootCmd = &cobra.Command{

 It discovers running containers, stores them in a config file,
 and generates + manages systemd .service units for each one.`,
-	Version: "0.1.0",
+	Version: version,
 }

 func Execute() {
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -63,10 +63,10 @@ func runUpdate(cmd *cobra.Command, args []string) error {
 		return err
 	}

-	prefix, suffix, serviceUser := cfg.Prefix, cfg.Suffix, cfg.EffectiveServiceUser()
+	prefix, suffix := cfg.Prefix, cfg.Suffix

 	if systemd.IsInstalled(*u, prefix, suffix) {
-		if err := systemd.Install(*u, prefix, suffix, serviceUser); err != nil {
+		if err := systemd.Install(*u, prefix, suffix); err != nil {
 			return fmt.Errorf("recreating service file: %w", err)
 		}
 		path, _ := systemd.UnitPath(*u, prefix, suffix)
--- a/config/config.go
+++ b/config/config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"fmt"
 	"os"
-	"os/user"
 	"path/filepath"

 	"gopkg.in/yaml.v3"
@@ -14,32 +13,23 @@ const DefaultConfigPath = "/etc/unitdore/units.yaml"
 // Unit represents a single managed container unit.
 type Unit struct {
 	Name           string `yaml:"name"`
-	Runtime        string `yaml:"runtime"`         // podman | docker | exec
-	User           string `yaml:"user,omitempty"`  // empty = root/system unit
+	Runtime        string `yaml:"runtime"`           // podman | docker | exec
+	User           string `yaml:"user,omitempty"`    // empty = root/system unit
 	Command        string `yaml:"command,omitempty"` // override ExecStart
 	Order          int    `yaml:"order"`
 	Delay          string `yaml:"delay,omitempty"` // e.g. "5s"
 	Enabled        bool   `yaml:"enabled"`
 	DisabledReason string `yaml:"disabled_reason,omitempty"`
+	Restart        bool   `yaml:"restart,omitempty"`         // enable Restart=on-failure
+	RestartSec     int    `yaml:"restart_sec,omitempty"`     // seconds between restarts
+	RestartRetries int    `yaml:"restart_retries,omitempty"` // max restart attempts (StartLimitBurst)
 }

 // Config is the root config structure.
 type Config struct {
-	Units       []Unit `yaml:"units"`
-	Prefix      string `yaml:"prefix,omitempty"`       // prepended to generated service name, e.g. "prod-"
-	Suffix      string `yaml:"suffix,omitempty"`       // appended to generated service name, e.g. "-svc"
-	ServiceUser string `yaml:"service_user,omitempty"` // User= in [Service] section; defaults to "unitdore"
-}
-
-// EffectiveServiceUser returns the configured service user, or the current OS user if unset.
-func (c *Config) EffectiveServiceUser() string {
-	if c.ServiceUser != "" {
-		return c.ServiceUser
-	}
-	if u, err := user.Current(); err == nil {
-		return u.Username
-	}
-	return "root"
+	Units  []Unit `yaml:"units"`
+	Prefix string `yaml:"prefix,omitempty"` // prepended to generated service name, e.g. "prod-"
+	Suffix string `yaml:"suffix,omitempty"` // appended to generated service name, e.g. "-svc"
 }

 // Load reads and parses the config file at path.
--- a/pkg/arch/PKGBUILD
+++ b/pkg/arch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Hein (Warky Devs) <hein@warky.dev>
 pkgname=unitdore
-pkgver=0.1.0
+pkgver=0.0.8
 pkgrel=1
 pkgdesc="A door you open and close for container units — manage containers via systemd"
 arch=('x86_64' 'aarch64')
@@ -12,26 +12,25 @@ optdepends=(
    'docker: Docker container runtime support'
 )
 makedepends=('go')
-backup=('etc/unitdore/units.yaml')
 source=("$pkgname-$pkgver.zip::$url/archive/v$pkgver.zip")
 sha256sums=('SKIP')

 build() {
-    cd "$pkgname-v$pkgver"
+    cd "$pkgname"
    export CGO_ENABLED=0
    go build \
        -trimpath \
-        -ldflags "-X main.version=$pkgver" \
+        -ldflags "-X github.com/warkanum/unitdore/cmd.version=$pkgver" \
        -o "$pkgname" .
 }

 check() {
-    cd "$pkgname-v$pkgver"
+    cd "$pkgname"
    go test ./...
 }

 package() {
-    cd "$pkgname-v$pkgver"
+    cd "$pkgname"

    # Binary
    install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
--- a/pkg/centos/unitdore.spec
+++ b/pkg/centos/unitdore.spec
@@ -1,5 +1,5 @@
 Name:           unitdore
-Version:        0.1.0
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Manage container units via systemd

@@ -10,6 +10,8 @@ Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  golang >= 1.23
 Requires:       systemd

+%global debug_package %{nil}
+
 %description
 Unitdore bridges your container runtime (Podman, Docker) and systemd.
 It discovers running containers, stores them in a config file, and generates
@@ -22,24 +24,21 @@ and manages systemd .service units for each one.
 export CGO_ENABLED=0
 go build \
    -trimpath \
-    -ldflags "-X main.version=%{version}" \
+    -ldflags "-X github.com/warkanum/unitdore/cmd.version=%{version}" \
    -o %{name} .

 %install
-# Binary
 install -Dm755 %{name} %{buildroot}%{_bindir}/%{name}
-
-# Man page
 install -Dm644 docs/unitdore.1 %{buildroot}%{_mandir}/man1/unitdore.1
-
-# Config dir
+install -Dm644 LICENSE %{buildroot}%{_licensedir}/%{name}/LICENSE
 install -dm755 %{buildroot}%{_sysconfdir}/unitdore

 %files
+%license LICENSE
 %{_bindir}/%{name}
 %{_mandir}/man1/unitdore.1*
 %dir %{_sysconfdir}/unitdore

 %changelog
-* Tue Apr 08 2026 Hein (Warky Devs) <hein@warky.dev> - 0.1.0-1
+* Wed Apr 08 2026 Hein (Warky Devs) <hein@warky.dev> - 0.0.5-1
 - Initial package
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -2,6 +2,9 @@ Package: unitdore
 Version: VERSION
 Architecture: ARCH
 Maintainer: Hein (Warky Devs) <hein@warky.dev>
+Section: admin
+Priority: optional
+Homepage: https://git.warky.dev/wdevs/unitdore
 Depends: systemd
 Recommends: podman | docker.io
 Description: A door you open and close for container units
--- a/systemd/generator.go
+++ b/systemd/generator.go
@@ -13,15 +13,20 @@ const systemUnitTemplate = `# /etc/systemd/system/{{.ServiceName}}

 [Unit]
 Description=Unitdore: {{.Unit.Name}} ({{.Unit.Runtime}})
-After=network.target
+After=network.target{{with .RuntimeService}} {{.}}
+Requires={{.}}{{end}}

 [Service]
 Type=simple
-User={{.ServiceUser}}
 ExecStart={{.ExecStart}}
 ExecStop={{.ExecStop}}
+{{- if .Unit.Restart}}
 Restart=on-failure
-RestartSec=5
+RestartSec={{.Unit.RestartSec}}
+{{- if gt .Unit.RestartRetries 0}}
+StartLimitBurst={{.Unit.RestartRetries}}
+{{- end}}
+{{- end}}

 [Install]
 WantedBy=multi-user.target
@@ -38,19 +43,24 @@ After=default.target
 Type=simple
 ExecStart={{.ExecStart}}
 ExecStop={{.ExecStop}}
+{{- if .Unit.Restart}}
 Restart=on-failure
-RestartSec=5
+RestartSec={{.Unit.RestartSec}}
+{{- if gt .Unit.RestartRetries 0}}
+StartLimitBurst={{.Unit.RestartRetries}}
+{{- end}}
+{{- end}}

 [Install]
 WantedBy=default.target
 `

 type templateData struct {
-	ServiceName string
-	Unit        config.Unit
-	ExecStart   string
-	ExecStop    string
-	ServiceUser string
+	ServiceName    string
+	Unit           config.Unit
+	ExecStart      string
+	ExecStop       string
+	RuntimeService string
 }

 // ServiceName returns the systemd service name for a unit, with optional prefix/suffix.
@@ -59,15 +69,15 @@ func ServiceName(u config.Unit, prefix, suffix string) string {
 }

 // Generate produces the .service file content for a unit.
-func Generate(u config.Unit, prefix, suffix, serviceUser string) (string, error) {
+func Generate(u config.Unit, prefix, suffix string) (string, error) {
 	execStart, execStop := buildExecCommands(u)

 	data := templateData{
-		ServiceName: ServiceName(u, prefix, suffix),
-		Unit:        u,
-		ExecStart:   execStart,
-		ExecStop:    execStop,
-		ServiceUser: serviceUser,
+		ServiceName:    ServiceName(u, prefix, suffix),
+		Unit:           u,
+		ExecStart:      execStart,
+		ExecStop:       execStop,
+		RuntimeService: runtimeService(u.Runtime),
 	}

 	tmplStr := systemUnitTemplate
@@ -87,6 +97,15 @@ func Generate(u config.Unit, prefix, suffix, serviceUser string) (string, error)
 	return buf.String(), nil
 }

+// runtimeService returns the systemd service name that must be running for the
+// given container runtime, or "" if none is required (e.g. daemonless podman).
+func runtimeService(runtime string) string {
+	if runtime == "docker" {
+		return "docker.service"
+	}
+	return ""
+}
+
 func buildExecCommands(u config.Unit) (start, stop string) {
 	// If a custom command is provided, use it directly
 	if u.Command != "" {
--- a/systemd/generator_test.go
+++ b/systemd/generator_test.go
@@ -35,7 +35,7 @@ func TestGenerate_SystemUnit(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "", "", "unitdore")
+	content, err := Generate(u, "", "")
 	if err != nil {
 		t.Fatalf("Generate() error: %v", err)
 	}
@@ -50,7 +50,6 @@ func TestGenerate_SystemUnit(t *testing.T) {
 		"WantedBy=multi-user.target",
 		"ExecStart=/usr/bin/podman start -a nginx",
 		"ExecStop=/usr/bin/podman stop nginx",
-		"Restart=on-failure",
 		"Generated by unitdore",
 	}

@@ -59,6 +58,16 @@ func TestGenerate_SystemUnit(t *testing.T) {
 			t.Errorf("Generate() missing %q in output:\n%s", check, content)
 		}
 	}
+
+	if strings.Contains(content, "User=") {
+		t.Errorf("Generate() system unit should not contain User= directive:\n%s", content)
+	}
+	if strings.Contains(content, "Requires=") {
+		t.Errorf("Generate() podman system unit should not contain Requires= (podman is daemonless):\n%s", content)
+	}
+	if strings.Contains(content, "Restart=") {
+		t.Errorf("Generate() restart should be disabled by default:\n%s", content)
+	}
 }

 func TestGenerate_UserUnit(t *testing.T) {
@@ -70,7 +79,7 @@ func TestGenerate_UserUnit(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "", "", "unitdore")
+	content, err := Generate(u, "", "")
 	if err != nil {
 		t.Fatalf("Generate() error: %v", err)
 	}
@@ -93,6 +102,51 @@ func TestGenerate_UserUnit(t *testing.T) {
 	}
 }

+func TestGenerate_WithRestart(t *testing.T) {
+	t.Run("restart with retries", func(t *testing.T) {
+		u := config.Unit{
+			Name:           "nginx",
+			Runtime:        "podman",
+			Enabled:        true,
+			Restart:        true,
+			RestartSec:     5,
+			RestartRetries: 3,
+		}
+		content, err := Generate(u, "", "")
+		if err != nil {
+			t.Fatalf("Generate() error: %v", err)
+		}
+		for _, want := range []string{"Restart=on-failure", "RestartSec=5", "StartLimitBurst=3"} {
+			if !strings.Contains(content, want) {
+				t.Errorf("Generate() missing %q in output:\n%s", want, content)
+			}
+		}
+	})
+
+	t.Run("restart without retries", func(t *testing.T) {
+		u := config.Unit{
+			Name:       "nginx",
+			Runtime:    "podman",
+			Enabled:    true,
+			Restart:    true,
+			RestartSec: 10,
+		}
+		content, err := Generate(u, "", "")
+		if err != nil {
+			t.Fatalf("Generate() error: %v", err)
+		}
+		if !strings.Contains(content, "Restart=on-failure") {
+			t.Errorf("Generate() missing Restart=on-failure:\n%s", content)
+		}
+		if !strings.Contains(content, "RestartSec=10") {
+			t.Errorf("Generate() missing RestartSec=10:\n%s", content)
+		}
+		if strings.Contains(content, "StartLimitBurst") {
+			t.Errorf("Generate() should not contain StartLimitBurst when retries=0:\n%s", content)
+		}
+	})
+}
+
 func TestGenerate_CustomCommand(t *testing.T) {
 	u := config.Unit{
 		Name:    "custom",
@@ -101,7 +155,7 @@ func TestGenerate_CustomCommand(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "", "", "unitdore")
+	content, err := Generate(u, "", "")
 	if err != nil {
 		t.Fatalf("Generate() error: %v", err)
 	}
@@ -118,16 +172,21 @@ func TestGenerate_DockerRuntime(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "", "", "unitdore")
+	content, err := Generate(u, "", "")
 	if err != nil {
 		t.Fatalf("Generate() error: %v", err)
 	}

-	if !strings.Contains(content, "ExecStart=/usr/bin/docker start redis") {
-		t.Errorf("Generate() wrong ExecStart for docker:\n%s", content)
+	checks := []string{
+		"ExecStart=/usr/bin/docker start redis",
+		"ExecStop=/usr/bin/docker stop redis",
+		"After=network.target docker.service",
+		"Requires=docker.service",
 	}
-	if !strings.Contains(content, "ExecStop=/usr/bin/docker stop redis") {
-		t.Errorf("Generate() wrong ExecStop for docker:\n%s", content)
+	for _, check := range checks {
+		if !strings.Contains(content, check) {
+			t.Errorf("Generate() docker runtime missing %q in output:\n%s", check, content)
+		}
 	}
 }

@@ -138,7 +197,7 @@ func TestGenerate_UnknownRuntime(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "", "", "unitdore")
+	content, err := Generate(u, "", "")
 	if err != nil {
 		t.Fatalf("Generate() should not error on unknown runtime: %v", err)
 	}
@@ -155,7 +214,7 @@ func TestGenerate_WithPrefixSuffix(t *testing.T) {
 		Enabled: true,
 	}

-	content, err := Generate(u, "prod-", "-web", "unitdore")
+	content, err := Generate(u, "prod-", "-web")
 	if err != nil {
 		t.Fatalf("Generate() error: %v", err)
 	}
--- a/systemd/manager.go
+++ b/systemd/manager.go
@@ -27,8 +27,8 @@ func UnitPath(u config.Unit, prefix, suffix string) (string, error) {
 }

 // Install writes the .service file for a unit and reloads systemd.
-func Install(u config.Unit, prefix, suffix, serviceUser string) error {
-	content, err := Generate(u, prefix, suffix, serviceUser)
+func Install(u config.Unit, prefix, suffix string) error {
+	content, err := Generate(u, prefix, suffix)
 	if err != nil {
 		return err
 	}
Author	SHA1	Message	Date
Hein	2efccc5d4f	chore(release): update package version to 0.0.8 Some checks failed Release / test (push) Successful in -30m10s Details Release / release (push) Successful in -30m3s Details Release / pkg-aur (push) Successful in -29m57s Details Release / pkg-rpm (push) Failing after 14m44s Details Release / pkg-deb (push) Failing after 14m51s Details	2026-04-10 09:38:59 +02:00
Hein	b58373ad2f	feat(config): add restart options for unit configuration * include Restart, RestartSec, and RestartRetries fields * update service file generation to support restart settings * add tests for restart behavior in unit generation	2026-04-10 09:38:45 +02:00
Hein	a273232303	chore(release): update package version to 0.0.7 All checks were successful Release / release (push) Successful in -30m29s Details Release / pkg-aur (push) Successful in -30m19s Details Release / test (push) Successful in -30m43s Details Release / pkg-deb (push) Successful in -30m29s Details Release / pkg-rpm (push) Successful in -29m17s Details	2026-04-08 19:59:11 +02:00
Hein	fae49a258c	ci(release): improve RPM upload logic in release workflow	2026-04-08 19:59:00 +02:00
Hein	00bc6ed893	chore(release): update package version to 0.0.6 Some checks failed Release / test (push) Successful in -30m39s Details Release / release (push) Successful in -30m31s Details Release / pkg-deb (push) Successful in -30m33s Details Release / pkg-aur (push) Successful in -29m41s Details Release / pkg-rpm (push) Failing after -29m26s Details	2026-04-08 19:48:22 +02:00
Hein	b44546dc24	docs(README): update installation instructions for various distributions	2026-04-08 19:48:07 +02:00
Hein	c6198ea6b7	chore(release): update package version to 0.0.4 and fix build paths Some checks failed Release / pkg-deb (push) Successful in -30m35s Details Release / pkg-aur (push) Successful in -30m17s Details Release / pkg-rpm (push) Failing after -29m39s Details Release / test (push) Successful in -30m39s Details Release / release (push) Successful in -30m33s Details * Adjust pkgver in PKGBUILD to 0.0.4 * Update build paths in PKGBUILD for consistency * Enhance AUR package versioning logic in release workflow	2026-04-08 17:50:15 +02:00
Hein	9ef31866f1	chore(release): update curl installation in Rocky 9 image	2026-04-08 17:35:12 +02:00
Hein	77b86dc3fc	chore(aur): improve AUR SSH key handling logic Some checks failed Release / test (push) Successful in -30m41s Details Release / pkg-deb (push) Successful in -30m32s Details Release / release (push) Successful in -30m33s Details Release / pkg-rpm (push) Failing after -30m32s Details Release / pkg-aur (push) Successful in -30m34s Details	2026-04-08 17:19:13 +02:00
Hein	0999303cd3	chore(aur): enhance AUR SSH setup for key handling * Improve SSH key handling with support for raw, escaped, and base64-encoded keys * Add validation for AUR_SSH_KEY to ensure it's a valid private key * Update SSH command options for better security and reliability	2026-04-08 17:02:10 +02:00
Hein	384c4592d1	chore(release): remove key content diagnostics from AUR SSH setup	2026-04-08 16:39:06 +02:00
Hein	815bdfed80	chore(release): enhance AUR SSH setup for key handling * Improve SSH key setup by auto-detecting key format * Add diagnostics for key validation and size	2026-04-08 15:41:35 +02:00
Hein	243da39fe3	chore(release): update AUR SSH setup to use base64 decoding	2026-04-08 15:29:21 +02:00
Hein	0a1e768dfe	chore(release): remove Arch package build steps from workflow	2026-04-08 15:23:10 +02:00