profiles

README.md

@@ -6,7 +6,6 @@ This repository defines a private, self-hosted DevOps stack running on Raspberry
 * **Drone** for CI/CD automation
 * **Docker Registry** with **Registry UI**
 * **Drone Runner** for build execution
-* **PyPI Server** for private Python package hosting
 
 ---
 
@@ -19,7 +18,6 @@ This repository defines a private, self-hosted DevOps stack running on Raspberry
 | **drone-runner** | Executes Drone pipelines on local Docker host        | —         | drone-server |
 | **registry**     | Private Docker registry                              | 6005      | —            |
 | **registry-ui**  | Web UI for browsing and managing the registry images | 6001      | registry     |
-| **pypi-server**  | Private Python package index and repository          | 6006      | —            |
 
 ---
 
@@ -114,7 +112,7 @@ Self-hosted Git service used as Drone’s SCM backend and code hosting platform.
 
 #### Extra Config Required
 
-1. Access Gitea at [https://git.aetoskia.com](https://git.aetoskia.com).
+1. Access Gitea at [https://gitea.aetoskia.com:6002](https://gitea.aetoskia.com:6002).
 2. Log in as the **`aetos`** admin user (repository owner).
 3. Verify Drone OAuth App is registered with:
 
@@ -145,8 +143,8 @@ Core CI/CD engine that connects to Gitea and manages build pipelines.
 
 #### Environment
 
-* **DRONE_GITEA_CLIENT_ID / SECRET:** OAuth credentials from git.
+* **DRONE_GITEA_CLIENT_ID / SECRET:** OAuth credentials from Gitea.
-* **DRONE_GITEA_SERVER:** Gitea URL (`https://git.aetoskia.com`).
+* **DRONE_GITEA_SERVER:** Gitea URL (`https://gitea.aetoskia.com`).
 * **DRONE_RPC_SECRET:** Shared secret for secure runner communication.
 * **DRONE_SERVER_HOST / PROTO:** External access configuration.
 
@@ -212,66 +210,14 @@ Executes pipeline steps on the Docker host using the Drone RPC secret.
 
 ---
 
-### 🐍 **PyPI Server**
-
-Private Python package index for hosting internal packages and dependencies.
-
-#### Ports
-
-* **6006 → 8080** — Accessible via browser or pip client.
-
-#### Mounts
-
-* `/mnt/omnissiah-vault/data/pypiserver:/data` — Package storage directory.
-* `/mnt/omnissiah-vault/data/pypiserver/auth:/auth (ro)` — Authentication credentials.
-
-#### Environment
-
-* **PYPISERVER_AUTH=update,download,list** — Enables controlled access.
-
-#### Command
-
-```yaml
-command:
-  - -P
-  - /auth/htpasswd
-  - -a
-  - update,download,list
-  - /data/packages
-```
-
-#### Usage
-
-To upload packages:
-
-```bash
-pip install twine
-TWINE_USERNAME=<username> TWINE_PASSWORD=<password> twine upload --repository-url https://pip.aetoskia.com dist/*
-```
-
-To install packages:
-
-```bash
-pip install --index-url https://<username>:<password>@pip.aetoskia.com/simple <package-name>
-```
-
-#### Notes
-
-* Make sure `/data/packages` exists inside the container.
-* The `htpasswd` file controls user access levels.
-* Test the endpoint in browser: [https://pip.aetoskia.com](https://pip.aetoskia.com)
-
----
-
 ## 🧬 Network Integration
 
 Ensure `/etc/hosts` on all relevant devices (Pi nodes, local dev systems) includes:
 
 ```
-192.168.1.111 git.aetoskia.com
+192.168.1.111 gitea.aetoskia.com
 192.168.1.111 drone.aetoskia.com
 192.168.1.111 dcr.aetoskia.com
-192.168.1.111 pip.aetoskia.com
 ```
 
 ---
@@ -284,19 +230,18 @@ Ensure `/etc/hosts` on all relevant devices (Pi nodes, local dev systems) includ
   docker compose --profile private-pi up -d
   ```
 * Drone and Gitea must both trust the same SSL certificate chain under `/home/aetos/certs`.
-* The `registry-ui`, `drone-runner`, and `pypi-server` depend on hostname resolution between internal services.
+* The `registry-ui` and `drone-runner` depend on hostname resolution between internal services, so avoid using raw IPs in environment variables.
 
 ---
 
 ## ✅ Quick Test Checklist
 
 | Component        | URL                                                                                    | Expected Result                       |
-| ---------------- |------------------------------------------------------------------------------| ------------------------------------- |
+| ---------------- | -------------------------------------------------------------------------------------- | ------------------------------------- |
-| **Gitea**        | [https://git.aetoskia.com](https://git.aetoskia.com)                         | Gitea login page                      |
+| **Gitea**        | [https://gitea.aetoskia.com:6002](https://gitea.aetoskia.com:6002)                     | Gitea login page                      |
-| **Drone**        | [https://drone.aetoskia.com](https://drone.aetoskia.com)                     | Drone CI UI linked to Gitea           |
+| **Drone**        | [https://drone.aetoskia.com:6003](https://drone.aetoskia.com:6003)                     | Drone CI UI linked to Gitea           |
-| **Registry UI**  | [https://registry.aetoskia.com](https://registry.aetoskia.com)               | Authenticated Docker registry browser |
+| **Registry UI**  | [http://localhost:6001](http://localhost:6001)                                         | Authenticated Docker registry browser |
-| **Registry API** | [https://dcr.aetoskia.com/v2/_catalog](https://dcr.aetoskia.com/v2/_catalog) | JSON listing of repositories          |
+| **Registry API** | [https://dcr.aetoskia.com:6005/v2/_catalog](https://dcr.aetoskia.com:6005/v2/_catalog) | JSON listing of repositories          |
-| **PyPI Server**  | [https://pip.aetoskia.com/simple](https://pip.aetoskia.com/simple)           | Simple index page                     |
 
 ---
 

docker-compose.yaml

@@ -2,7 +2,7 @@
 x-volume-configs:
   gitea: &gitea_volumes
     - type: bind
-      source: /home/aetos/gitea
+      source: /mnt/omnissiah-vault/configs/gitea
       target: /data
       bind:
         create_host_path: true
@@ -28,15 +28,6 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
-  pypi: &pypi_volumes
-    - /mnt/omnissiah-vault/configs/auth:/auth:ro
-
-    - type: bind
-      source: /mnt/omnissiah-vault/data/pypi/packages
-      target: /data/packages
-      bind:
-        create_host_path: true
-
 services:
   registry-ui:
     image: joxit/docker-registry-ui:latest
@@ -84,13 +75,15 @@ services:
     environment:
       DRONE_GITEA_CLIENT_ID: 8445594d-7c03-41a1-b66d-4296f34fa644
       DRONE_GITEA_CLIENT_SECRET: gto_f46d6utmlttauajdjxpfgikskb3j5epoohzhpp2r6j2jbed46iaq
-      DRONE_GITEA_SERVER: https://git.aetoskia.com
+      DRONE_GITEA_SERVER: https://gitea.aetoskia.com
       DRONE_RPC_SECRET: supersecretkey
       DRONE_SERVER_HOST: drone.aetoskia.com
       DRONE_SERVER_PROTO: https
     restart: always
+    depends_on:
+      - gitea
     extra_hosts:
-      - "git.aetoskia.com:192.168.1.111"
+      - "gitea.aetoskia.com:192.168.1.111"
     command: sh -c "update-ca-certificates && drone-server"
     profiles:
       - server-pi
@@ -106,7 +99,7 @@ services:
       DRONE_RPC_PROTO: https
       DRONE_RPC_HOST: drone.aetoskia.com
       DRONE_RPC_SECRET: supersecretkey
-      DRONE_RUNNER_CAPACITY: 1
+      DRONE_RUNNER_CAPACITY: 2
       DRONE_RUNNER_NAME: runner1
       DRONE_RUNNER_OS: linux
       DRONE_RUNNER_ARCH: arm64
@@ -131,22 +124,3 @@ services:
     restart: always
     profiles:
       - server-pi
-
-  pypi-server:
-    image: pypiserver/pypiserver:latest
-    container_name: pypi-server
-    restart: unless-stopped
-    ports:
-      - "6006:8080"
-    volumes: *pypi_volumes
-    environment:
-      - PYPISERVER_AUTH=update,download,list
-      - PYPISERVER_DATA_DIR=/data
-    command:
-      - -P
-      - /auth/htpasswd
-      - -a
-      - update,download,list
-      - /data/packages
-    profiles:
-      - server-pi