Merge packaging docs into one page

docs/faq.md

@@ -34,6 +34,10 @@ The project was started by workers at [Autonomic](https://autonomic.zone/) which
 
 Please read our [initial project announcement post](https://autonomic.zone/blog/co-op-cloud/) for more on this.
 
+## How do I package an app?
+
+See [the packager guide documentation](/packager-guide/#package-your-first-application) for more.
+
 ## What about `$alternative`?
 
 We have various technical critiques of other similar projects which are already up-and-running in the ecosystem, as they don't necessarily meet our needs as a small tech co-op. However, Co-op Cloud isn't meant to be a replacement for these other projects.

docs/package.md

@@ -1,42 +0,0 @@
----
-title: Package your first app
----
-
-Let's take as an example, [Matomo web analytics](https://matomo.org/).
-
-- Tired: Write your own image and compose file
-- Wired: Use someone else's image (& maybe compose file)
-- Inspired: Upstream image, someone else's compose file
-- On fire: Upstream compose file
-
-I'm feeling lazy so, luckily for me, Matomo already has an example compose file in their repository! Let's download and edit it:
-
-```
-mkdir matomo && cd matomo
-wget https://raw.githubusercontent.com/matomo-org/docker/master/.examples/apache/docker-compose.yml -O compose.yml
-```
-
-Open the `compose.yml` in your favourite editor and have a gander :swan: . There are a few things we're looking for -- full list to come -- but a few things we can immediately see are:
-
-1. Let's bump the version to `3.8`, to make sure we can use all the latest swarm coolness
-2. We load environment variables separately via [abra](/overview/#command-line-tool), so we'll strip out `env_file`.
-3. The `/var/www/html` volume definition on L21 is a bit overzealous; it means a copy of Matomo will be stored separately per app instance, which is a waste of space in most cases. We'll narrow it down according to the documentation -- here, the developers have been nice enough to suggest `logs` and `config` volumes instead, which is a decent start
-4. The MySQL passwords are sent as variables which is fine for basic use, but if we replace them with Docker secrets we can keep them out of our env files if we want to publish those more widely.
-5. The MariaDB service doesn't need to be exposed to the internet, so we can define an `internal` network for it to communicate with Matomo.
-6. Lastly, we want to use `deploy.labels` and remove the `ports:` definition, to tell Traefik to forward requests to Matomo based on hostname and generate an SSL certificate.
-
-The resulting `compose.yml` is available [here](https://git.autonomic.zone/coop-cloud/matomo/src/branch/main/compose.yml).
-
-Now, create an `.env` file (or call it anything else, but remember to specify the `-e` option for `abra`):
-
-```
-TYPE=matomo
-
-DOMAIN=matomo.example.com
-LETS_ENCRYPT_ENV=production
-
-SECRET_DB_PASSWORD_VERSION=v1
-SECRET_DB_ROOT_PASSWORD_VERSION=v1
-```
-
-Then, open the `DOMAIN` you configured (you might need to wait a while for Traefik to generate SSL certificates) to finish the set-up. Luckily, this container is (mostly) configurable via environment variables -- if we want to auto-generate the configuration we can use a `config` and / or a custom `entrypoint` (see [`coop-cloud/mediawiki`](https://git.autonomic.zone/coop-cloud/mediawiki) for examples of both).

docs/packager-guide.md

@@ -2,6 +2,47 @@
 title: Packager guide
 ---
 
+## Package your first application
+
+Let's take as an example, [Matomo web analytics](https://matomo.org/).
+
+- Tired: Write your own image and compose file
+- Wired: Use someone else's image (& maybe compose file)
+- Inspired: Upstream image, someone else's compose file
+- On fire: Upstream compose file
+
+I'm feeling lazy so, luckily for me, Matomo already has an example compose file in their repository! Let's download and edit it:
+
+```
+mkdir matomo && cd matomo
+wget https://raw.githubusercontent.com/matomo-org/docker/master/.examples/apache/docker-compose.yml -O compose.yml
+```
+
+Open the `compose.yml` in your favourite editor and have a gander :swan: . There are a few things we're looking for -- full list to come -- but a few things we can immediately see are:
+
+1. Let's bump the version to `3.8`, to make sure we can use all the latest swarm coolness
+2. We load environment variables separately via [abra](/overview/#command-line-tool), so we'll strip out `env_file`.
+3. The `/var/www/html` volume definition on L21 is a bit overzealous; it means a copy of Matomo will be stored separately per app instance, which is a waste of space in most cases. We'll narrow it down according to the documentation -- here, the developers have been nice enough to suggest `logs` and `config` volumes instead, which is a decent start
+4. The MySQL passwords are sent as variables which is fine for basic use, but if we replace them with Docker secrets we can keep them out of our env files if we want to publish those more widely.
+5. The MariaDB service doesn't need to be exposed to the internet, so we can define an `internal` network for it to communicate with Matomo.
+6. Lastly, we want to use `deploy.labels` and remove the `ports:` definition, to tell Traefik to forward requests to Matomo based on hostname and generate an SSL certificate.
+
+The resulting `compose.yml` is available [here](https://git.autonomic.zone/coop-cloud/matomo/src/branch/main/compose.yml).
+
+Now, create an `.env` file (or call it anything else, but remember to specify the `-e` option for `abra`):
+
+```
+TYPE=matomo
+
+DOMAIN=matomo.example.com
+LETS_ENCRYPT_ENV=production
+
+SECRET_DB_PASSWORD_VERSION=v1
+SECRET_DB_ROOT_PASSWORD_VERSION=v1
+```
+
+Then, open the `DOMAIN` you configured (you might need to wait a while for Traefik to generate SSL certificates) to finish the set-up. Luckily, this container is (mostly) configurable via environment variables -- if we want to auto-generate the configuration we can use a `config` and / or a custom `entrypoint` (see [`coop-cloud/mediawiki`](https://git.autonomic.zone/coop-cloud/mediawiki) for examples of both).
+
 ## How apps are versioned
 
 Co-op Cloud follows the version scheme of the applications we're packaging, as

mkdocs.yml

@@ -41,8 +41,7 @@ nav:
   - Frequently asked questions: faq.md
   - Contributing guide: contribute.md
   - Admin guide:
-      - Package your first app: package.md
-      - Manage your app configuration: config.md
+      - How to manage the .abra directory: config.md
       - Manage secret data: secrets.md
       - Back-up and restore an app: backup-restore.md
       - Scale an app up to handle more traffic: scale.md