fix(neuron): install config at /etc/neuron/, not /etc/cortex/

The neuron package was shipping its config at /etc/cortex/neuron.toml,
which implied a shared config directory between two independent
packages. Move to /etc/neuron/neuron.toml — neuron owns its own etc
dir, consistent with its own /usr/lib/sysusers.d/neuron.conf and
/usr/lib/systemd/system/neuron.service. Updated the systemd unit's
ExecStart path and the example toml header to match.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.gitea/workflows/ci.yml

@@ -24,6 +24,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache cargo registry and target
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin
+            ~/.cargo/registry/index
+            ~/.cargo/registry/cache
+            ~/.cargo/git/db
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
       - name: Ensure sccache with S3 support
         env:
           RUSTC_WRAPPER: ""
@@ -53,8 +66,6 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Determine version
         id: version
@@ -68,12 +79,6 @@ jobs:
           sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
           sed -i "s/^Version:.*/Version:        ${VERSION}/" cortex.spec
 
-      - name: Generate changelog entry
-        uses: https://git.lair.cafe/actions/rpm-changelog@v1
-        with:
-          spec: cortex.spec
-          version: ${{ steps.version.outputs.VERSION }}
-
       - name: Generate source tarball
         run: |
           set -ex
@@ -113,8 +118,6 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Determine version
         id: version
@@ -126,37 +129,31 @@ jobs:
         run: |
           VERSION="${{ steps.version.outputs.VERSION }}"
           sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
-          sed -i "s/^Version:.*/Version:        ${VERSION}/" helexa-neuron.spec
+          sed -i "s/^Version:.*/Version:        ${VERSION}/" neuron.spec
-
-      - name: Generate changelog entry
-        uses: https://git.lair.cafe/actions/rpm-changelog@v1
-        with:
-          spec: helexa-neuron.spec
-          version: ${{ steps.version.outputs.VERSION }}
 
       - name: Generate source tarball
         run: |
           set -ex
           VERSION="${{ steps.version.outputs.VERSION }}"
-          tar czf /tmp/helexa-neuron-${VERSION}.tar.gz \
+          tar czf /tmp/neuron-${VERSION}.tar.gz \
-            --transform "s,^\.,helexa-neuron-${VERSION}," \
+            --transform "s,^\.,neuron-${VERSION}," \
             --exclude='./target' \
             --exclude='./.git' \
             --exclude='*.tar.gz' \
             --exclude='*.src.rpm' \
             .
-          mv /tmp/helexa-neuron-${VERSION}.tar.gz .
+          mv /tmp/neuron-${VERSION}.tar.gz .
 
       - name: Vendor Rust dependencies
         run: |
           VERSION="${{ steps.version.outputs.VERSION }}"
           cargo vendor vendor/
-          tar czf helexa-neuron-${VERSION}-vendor.tar.gz vendor/
+          tar czf neuron-${VERSION}-vendor.tar.gz vendor/
           rm -rf vendor/
 
       - name: Build SRPM
         run: |
-          rpmbuild -bs helexa-neuron.spec \
+          rpmbuild -bs neuron.spec \
             --define "_sourcedir $(pwd)" \
             --define "_srcrpmdir $(pwd)"
 
@@ -179,7 +176,7 @@ jobs:
       - name: Publish to COPR
         uses: https://git.lair.cafe/actions/copr-publish@v1
         with:
-          project: helexa/helexa
+          project: helexa/cortex
           srpm: "*.src.rpm"
           copr-config: ${{ secrets.COPR_CONFIG }}
 
@@ -196,7 +193,7 @@ jobs:
       - name: Publish to COPR
         uses: https://git.lair.cafe/actions/copr-publish@v1
         with:
-          project: helexa/helexa
+          project: helexa/neuron
           srpm: "*.src.rpm"
           copr-config: ${{ secrets.COPR_CONFIG }}
 
@@ -206,43 +203,21 @@ jobs:
     needs: [copr-cortex, copr-neuron]
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
-      - name: Determine version
+      - name: Stamp version and push
-        id: version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
-
-      - name: Stamp version
-        run: |
-          VERSION="${{ steps.version.outputs.VERSION }}"
-          sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
-          sed -i "s/^Version:.*/Version:        ${VERSION}/" cortex.spec
-          sed -i "s/^Version:.*/Version:        ${VERSION}/" helexa-neuron.spec
-          cargo check --workspace 2>/dev/null || true
-
-      - name: Generate cortex changelog entry
-        uses: https://git.lair.cafe/actions/rpm-changelog@v1
-        with:
-          spec: cortex.spec
-          version: ${{ steps.version.outputs.VERSION }}
-
-      - name: Generate helexa-neuron changelog entry
-        uses: https://git.lair.cafe/actions/rpm-changelog@v1
-        with:
-          spec: helexa-neuron.spec
-          version: ${{ steps.version.outputs.VERSION }}
-
-      - name: Commit and push
         env:
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
-          VERSION="${{ steps.version.outputs.VERSION }}"
+          VERSION="${GITHUB_REF#refs/tags/v}"
+          sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
+          sed -i "s/^Version:.*/Version:        ${VERSION}/" cortex.spec
+          sed -i "s/^Version:.*/Version:        ${VERSION}/" neuron.spec
+          cargo check --workspace 2>/dev/null || true
           git config user.name "Gitea Actions"
           git config user.email "actions@git.lair.cafe"
-          git add Cargo.toml Cargo.lock cortex.spec helexa-neuron.spec
+          git add Cargo.toml Cargo.lock cortex.spec neuron.spec
           if git diff --cached --quiet; then
-            echo "Nothing to commit for ${VERSION}"
+            echo "Version already at ${VERSION}"
           else
             git commit -m "chore: bump version to ${VERSION}"
             git remote set-url origin "https://gitea-actions:${GITEA_TOKEN}@git.lair.cafe/helexa/cortex.git"

CLAUDE.md

@@ -125,8 +125,7 @@ automatically. Clippy warnings must be resolved, not suppressed with
   - One or more GPU nodes running mistral.rs on port 8080
   - Optionally a metrics-only node (no GPU) for Prometheus/Grafana
 - Each node runs `mistralrs serve` on port 8080
-- Gateway listens on port 31313 (API) and 31314 (metrics)
+- Gateway listens on port 8000 (API) and 9100 (metrics)
-- neuron listens on port 13131 on each GPU host
 - TLS terminated at gateway or via nginx; internal traffic is plaintext over WireGuard
 
 ## Conventions
@@ -381,7 +380,7 @@ processes (one process per loaded model, each on its own port).
 
 ## neuron API
 
-neuron exposes an HTTP API on port 13131 that cortex polls and calls.
+neuron exposes an HTTP API on port 9090 that cortex polls and calls.
 
 ```
 GET  /discovery
@@ -425,8 +424,8 @@ endpoint. cortex.toml shrinks to:
 
 ```toml
 [gateway]
-listen = "0.0.0.0:31313"
+listen = "0.0.0.0:8000"
-metrics_listen = "0.0.0.0:31314"
+metrics_listen = "0.0.0.0:9100"
 
 [eviction]
 strategy = "lru"
@@ -434,15 +433,15 @@ defrag_after_cycles = 50
 
 [[neurons]]
 name = "beast"
-endpoint = "http://beast.hanzalova.internal:13131"
+endpoint = "http://beast.hanzalova.internal:9090"
 
 [[neurons]]
 name = "benjy"
-endpoint = "http://benjy.hanzalova.internal:13131"
+endpoint = "http://benjy.kosherinata.internal:9090"
 
 [[neurons]]
 name = "quadbrat"
-endpoint = "http://quadbrat.hanzalova.internal:13131"
+endpoint = "http://quadbrat.hanzalova.internal:9090"
 ```
 
 On startup and periodically, cortex calls `GET /discovery` and
@@ -522,7 +521,7 @@ cortex/
 │   │       └── metrics.rs      # prometheus exporter (unchanged)
 │   ├── neuron/                 # node plane (replaces cortex-agent)
 │   │   └── src/
-│   │       ├── main.rs         # binary entrypoint, axum server on :13131
+│   │       ├── main.rs         # binary entrypoint, axum server on :9090
 │   │       ├── discovery.rs    # nvidia-smi, device enumeration
 │   │       ├── health.rs       # runtime GPU polling
 │   │       ├── api.rs          # HTTP handlers for /discovery, /models, etc.
@@ -596,24 +595,16 @@ placement matching can be added incrementally.
 Completed. Both packages have RPM specs, systemd units, and example configs.
 CI builds parallel SRPMs on tag push and publishes to separate COPR repos.
 
-- `cortex.spec` — installs the `cortex` binary. Package name keeps the
+- `cortex.spec` → `helexa/cortex` COPR: binary, systemd unit, config files
-  short `cortex` because no Fedora package collides with it.
+- `neuron.spec` → `helexa/neuron` COPR: binary, systemd unit, config
-- `helexa-neuron.spec` — installs the `neuron` binary under package name
-  `helexa-neuron`. Renamed from bare `neuron` to avoid collision with
-  Fedora's NEURON neural-simulation package
-  (https://src.fedoraproject.org/rpms/neuron); binary, systemd unit,
-  system user, and config dir all stay named `neuron` since those are
-  project-local contexts.
 - `data/cortex.service`, `data/neuron.service` — systemd units
 - `cortex.example.toml`, `neuron.example.toml`, `models.example.toml`
-- CI: parallel `srpm-cortex` + `srpm-neuron` jobs, then parallel COPR
+- CI: parallel `srpm-cortex` + `srpm-neuron` jobs, then parallel COPR publish
-  publish to a single project `helexa/helexa` hosting both packages.
 
 Install:
 ```sh
-dnf copr enable helexa/helexa
+dnf copr enable helexa/cortex && dnf install cortex    # gateway host
-dnf install cortex                # gateway host
+dnf copr enable helexa/neuron && dnf install neuron    # GPU nodes
-dnf install helexa-neuron         # GPU nodes
 ```
 
 ### Phase 11: llama.cpp harness stub

Cargo.lock

@@ -351,7 +351,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cortex-cli"
-version = "0.1.12"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -366,7 +366,7 @@ dependencies = [
 
 [[package]]
 name = "cortex-core"
-version = "0.1.12"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -381,7 +381,7 @@ dependencies = [
 
 [[package]]
 name = "cortex-gateway"
-version = "0.1.12"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "axum",
@@ -1184,7 +1184,7 @@ dependencies = [
 
 [[package]]
 name = "neuron"
-version = "0.1.12"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "async-trait",

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.1.12"
+version = "0.1.3"
 edition = "2024"
 license = "GPL-3.0-or-later"
 repository = "https://git.lair.cafe/helexa/cortex"

README.md

@@ -88,8 +88,8 @@ WantedBy=multi-user.target
 ```toml
 # cortex.toml
 [gateway]
-listen = "0.0.0.0:31313"
+listen = "0.0.0.0:8000"
-metrics_listen = "0.0.0.0:31314"
+metrics_listen = "0.0.0.0:9100"
 
 [eviction]
 strategy = "lru"        # lru | priority
@@ -143,7 +143,7 @@ cortex serve --config cortex.toml
 cortex status
 
 # list all models across nodes
-curl http://localhost:31313/v1/models
+curl http://localhost:8000/v1/models
 ```
 
 ## License

cortex.example.toml

@@ -3,11 +3,11 @@
 # Copy to cortex.toml and adjust for your environment.
 #
 # Environment variable overrides use CORTEX_ prefix with __ separators:
-#   CORTEX_GATEWAY__LISTEN=0.0.0.0:31313
+#   CORTEX_GATEWAY__LISTEN=0.0.0.0:9000
 
 [gateway]
-listen = "0.0.0.0:31313"
+listen = "0.0.0.0:8000"
-metrics_listen = "0.0.0.0:31314"
+metrics_listen = "0.0.0.0:9100"
 
 [eviction]
 strategy = "lru"

cortex.spec

@@ -1,5 +1,5 @@
 Name:           cortex
-Version:        0.1.12
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Inference gateway for multi-node GPU clusters
 
@@ -22,14 +22,11 @@ BuildRequires:  systemd-rpm-macros
 Requires(pre):  shadow-utils
 Requires:       systemd
 
-# systemd-rpm-macros ships a unit dep generator that parses User=/Group=
+# rpm's sysusers provides-generator only emits versioned user(cortex) when
-# from our .service file and emits Requires: user(cortex)/group(cortex).
+# the u-line has GECOS/home/shell fields. %attr(,,cortex) in %files emits
-# rpm's sysusers provides-generator emits the unversioned form for groups
+# an unversioned Requires: user(cortex), so we provide it explicitly.
-# but only a versioned user(cortex) = <base64> for users with GECOS/home/
-# shell. Provide the unversioned user(cortex) explicitly so dnf can resolve
-# the auto-generated Requires. Without this, dnf5 silently filters the
-# package and reports "Nothing to do".
 Provides:       user(cortex)
+Provides:       group(cortex)
 
 %description
 Cortex is a Rust reverse-proxy that sits in front of multiple inference
@@ -56,9 +53,9 @@ cargo build --release -p cortex-cli
 install -Dm755 target/release/cortex %{buildroot}%{_bindir}/cortex
 install -Dm644 data/cortex.service %{buildroot}%{_unitdir}/cortex.service
 install -Dm644 data/cortex-sysusers.conf %{buildroot}%{_sysusersdir}/cortex.conf
-install -dm755 %{buildroot}%{_sysconfdir}/cortex
+install -dm750 %{buildroot}%{_sysconfdir}/cortex
-install -Dm644 cortex.example.toml %{buildroot}%{_sysconfdir}/cortex/cortex.toml
+install -Dm640 cortex.example.toml %{buildroot}%{_sysconfdir}/cortex/cortex.toml
-install -Dm644 models.example.toml %{buildroot}%{_sysconfdir}/cortex/models.toml
+install -Dm640 models.example.toml %{buildroot}%{_sysconfdir}/cortex/models.toml
 
 %pre
 %sysusers_create_compat %{_builddir}/%{name}-%{version}/data/cortex-sysusers.conf
@@ -78,10 +75,10 @@ install -Dm644 models.example.toml %{buildroot}%{_sysconfdir}/cortex/models.toml
 %{_bindir}/cortex
 %{_unitdir}/cortex.service
 %{_sysusersdir}/cortex.conf
-%dir %{_sysconfdir}/cortex
+%dir %attr(750,root,cortex) %{_sysconfdir}/cortex
-%config(noreplace) %{_sysconfdir}/cortex/cortex.toml
+%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/cortex/cortex.toml
-%config(noreplace) %{_sysconfdir}/cortex/models.toml
+%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/cortex/models.toml
 
 %changelog
-* Wed Apr 15 2026 Rob Thijssen <grenade@rob.tn> - 0.1.0-1
+* Tue Apr 15 2026 Rob Thijssen <grenade@rob.tn> - 0.1.0-1
 - Initial package

crates/cortex-cli/src/main.rs

@@ -23,7 +23,7 @@ enum Commands {
     /// Print the fleet status (models, nodes, health).
     Status {
         /// Gateway API endpoint to query.
-        #[arg(short, long, default_value = "http://localhost:31313")]
+        #[arg(short, long, default_value = "http://localhost:8000")]
         endpoint: String,
     },
 }

crates/cortex-core/src/config.rs

@@ -22,9 +22,9 @@ fn default_models_path() -> String {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct GatewaySettings {
-    /// Address to listen on for API requests (e.g. "0.0.0.0:31313")
+    /// Address to listen on for API requests (e.g. "0.0.0.0:8000")
     pub listen: String,
-    /// Address to listen on for Prometheus metrics (e.g. "0.0.0.0:31314")
+    /// Address to listen on for Prometheus metrics (e.g. "0.0.0.0:9100")
     pub metrics_listen: String,
 }
 
@@ -50,7 +50,7 @@ pub enum EvictionStrategy {
 pub struct NeuronEndpoint {
     /// Human-readable node name (e.g. "beast")
     pub name: String,
-    /// Base URL of the neuron daemon (e.g. "http://beast.internal:13131")
+    /// Base URL of the neuron daemon (e.g. "http://beast.internal:9090")
     pub endpoint: String,
 }
 
@@ -70,8 +70,8 @@ impl Default for GatewayConfig {
     fn default() -> Self {
         Self {
             gateway: GatewaySettings {
-                listen: "0.0.0.0:31313".into(),
+                listen: "0.0.0.0:8000".into(),
-                metrics_listen: "0.0.0.0:31314".into(),
+                metrics_listen: "0.0.0.0:9100".into(),
             },
             eviction: EvictionSettings {
                 strategy: EvictionStrategy::Lru,

crates/cortex-core/src/node.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 #[derive(Debug, Clone)]
 pub struct NodeState {
     pub name: String,
-    /// Base URL of the neuron daemon (e.g. "http://beast.internal:13131").
+    /// Base URL of the neuron daemon (e.g. "http://beast.internal:9090").
     pub endpoint: String,
     pub healthy: bool,
     pub models: HashMap<String, ModelEntry>,

crates/neuron/src/config.rs

@@ -17,7 +17,7 @@ pub struct NeuronConfig {
 }
 
 fn default_port() -> u16 {
-    13131
+    9090
 }
 
 impl NeuronConfig {
@@ -33,7 +33,7 @@ impl NeuronConfig {
 impl Default for NeuronConfig {
     fn default() -> Self {
         Self {
-            port: 13131,
+            port: 9090,
             harnesses: vec![],
         }
     }

data/neuron-sysusers.conf

@@ -1,3 +0,0 @@
-g neuron - -
-u neuron - "Neuron GPU node daemon" /var/lib/neuron /sbin/nologin
-m neuron neuron

data/neuron.service

@@ -8,8 +8,8 @@ Type=simple
 ExecStart=/usr/bin/neuron --config /etc/neuron/neuron.toml
 Restart=on-failure
 RestartSec=5
-User=neuron
+User=cortex
-Group=neuron
+Group=cortex
 
 [Install]
 WantedBy=multi-user.target

neuron.example.toml

@@ -3,9 +3,9 @@
 # Copy to /etc/neuron/neuron.toml and adjust for your environment.
 #
 # Environment variable overrides use NEURON_ prefix with __ separators:
-#   NEURON_PORT=13131
+#   NEURON_PORT=9090
 
-port = 13131
+port = 9090
 
 # -- Harnesses ---------------------------------------------------------------
 # Each [[harnesses]] entry declares an inference engine managed by neuron.

neuron.spec

@@ -1,10 +1,7 @@
-Name:           helexa-neuron
+Name:           neuron
-Version:        0.1.12
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Per-node GPU discovery and harness management daemon for cortex
-# Package name disambiguates from Fedora's existing "neuron" package
-# (NEURON neural simulation environment from Yale). Binary, systemd
-# unit, and system user are still called "neuron" for brevity.
 
 License:        GPL-3.0-or-later
 URL:            https://git.lair.cafe/helexa/cortex
@@ -25,14 +22,11 @@ BuildRequires:  systemd-rpm-macros
 Requires(pre):  shadow-utils
 Requires:       systemd
 
-# systemd-rpm-macros ships a unit dep generator that parses User=/Group=
+# rpm's sysusers provides-generator only emits versioned user(cortex) when
-# from our .service file and emits Requires: user(neuron)/group(neuron).
+# the u-line has GECOS/home/shell fields. %attr(,,cortex) in %files emits
-# rpm's sysusers provides-generator emits the unversioned form for groups
+# an unversioned Requires: user(cortex), so we provide it explicitly.
-# but only a versioned user(neuron) = <base64> for users with GECOS/home/
+Provides:       user(cortex)
-# shell. Provide the unversioned user(neuron) explicitly so dnf can resolve
+Provides:       group(cortex)
-# the auto-generated Requires. Without this, dnf5 silently filters the
-# package and reports "Nothing to do".
-Provides:       user(neuron)
 
 %description
 Neuron is a per-node daemon for cortex inference clusters. It discovers
@@ -57,12 +51,12 @@ cargo build --release -p neuron
 %install
 install -Dm755 target/release/neuron %{buildroot}%{_bindir}/neuron
 install -Dm644 data/neuron.service %{buildroot}%{_unitdir}/neuron.service
-install -Dm644 data/neuron-sysusers.conf %{buildroot}%{_sysusersdir}/neuron.conf
+install -Dm644 data/cortex-sysusers.conf %{buildroot}%{_sysusersdir}/neuron.conf
-install -dm755 %{buildroot}%{_sysconfdir}/neuron
+install -dm750 %{buildroot}%{_sysconfdir}/neuron
-install -Dm644 neuron.example.toml %{buildroot}%{_sysconfdir}/neuron/neuron.toml
+install -Dm640 neuron.example.toml %{buildroot}%{_sysconfdir}/neuron/neuron.toml
 
 %pre
-%sysusers_create_compat %{_builddir}/%{name}-%{version}/data/neuron-sysusers.conf
+%sysusers_create_compat %{_builddir}/%{name}-%{version}/data/cortex-sysusers.conf
 
 %post
 %systemd_post neuron.service
@@ -79,9 +73,9 @@ install -Dm644 neuron.example.toml %{buildroot}%{_sysconfdir}/neuron/neuron.toml
 %{_bindir}/neuron
 %{_unitdir}/neuron.service
 %{_sysusersdir}/neuron.conf
-%dir %{_sysconfdir}/neuron
+%dir %attr(750,root,cortex) %{_sysconfdir}/neuron
-%config(noreplace) %{_sysconfdir}/neuron/neuron.toml
+%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/neuron/neuron.toml
 
 %changelog
-* Wed Apr 15 2026 Rob Thijssen <grenade@rob.tn> - 0.1.0-1
+* Tue Apr 15 2026 Rob Thijssen <grenade@rob.tn> - 0.1.0-1
 - Initial package