Merge pull request #71 from fairpm/just_start

Author: chuckadams

.env.example

@@ -3,7 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_TIMEZONE=UTC
-APP_URL=https://api.aspiredev.org
+APP_URL=https://api.aspirecloud.localhost
 
 
 # Feature Flags
@@ -61,12 +61,12 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
-MAIL_HOST=mail.aspiredev.org
+MAIL_HOST=mail.aspirecloud.localhost
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="do-not-reply@aspiredev.org"
+MAIL_FROM_ADDRESS="do-not-reply@aspirecloud.localhost"
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
@@ -78,13 +78,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 VITE_APP_NAME="${APP_NAME}"
 
 # Services configuration
-MAILGUN_DOMAIN=aspiredev.org
+MAILGUN_DOMAIN=aspirecloud.localhost
 MAILGUN_ENDPOINT=api.mailgun.net
 MAILGUN_SECRET=
 
 # AspirePress Related Configuration
-DOWNLOAD_BASE=https://api.aspiredev.org/download/
-# DOWNLOAD_BASE=https://fastly.api.aspiredev.org/download/
+DOWNLOAD_BASE=https://api.aspirecloud.localhost/download/
+# DOWNLOAD_BASE=https://fastly.api.aspirecloud.localhost/download/
 DOWNLOAD_CACHE_SECONDS=864000
 
 # Elasticsearch Configuration

Makefile

@@ -1,27 +1,15 @@
 [//]: # (@formatter:off)
 # AspireCloud
 
-This project is designed to function as a CDN/API endpoint system for distributing WordPress assets (themes, plugins, core) to users of the [AspirePress Updater](https://github.com/aspirepress/updater-plugin).
+This project is designed to function as an API endpoint for distributing [FAIR](https://fair.pm) packages.  Currently it can serve WordPress plugins through [FAIR Connect](https://github.com/fairpm/fair-plugin) as well as extensions for TYPO3 v14.0 and up.
 
-# 🪧 CloudFest Hackathon 2025: see [/docs/readme.hackathon.md](./docs/readme.hackathon.md)
+## Quick Start
 
-## Setup
+If you're new to FAIR, we recommend using the [start-here repo](https://github.com/fairpm/start-here#quick-start), which will download and bootstrap an AspireCloud instance with just one command (`just start`).  After that, your instance will be accessible at https://api.aspirecloud.localhost.
 
-### Quick Start
+### Quick Start for Standalone instance 
 
-```
-make init
-```
-
-Next configure WordPress to use your local version of AspireCloud, and you're good to go! 
-
-## Using https://api.aspiredev.org instead of localhost
-
-The local dev instance can be reached this way by enabling a [Traefik](https://hub.docker.com/_/traefik) proxy server:
-
-    make traefik-up
-
-You will then be able to reach the instance at https://api.aspiredev.org
+If you're not running the whole start-here stack, you can still bring up an AC instance with `just start` in a fresh checkout of the AspireCloud repo (this one).  Since none of the services expose local ports by default, you will want to edit `docker-compose.override.yml` to add listening ports (see docker-compose.override.yml.dist for examples).    
 
 ## Notes
 

README.md

@@ -1,8 +1,4 @@
 #!/bin/bash
-
 cd $(dirname $0)/..
-base=$(pwd)
-
-svc=${APP_SERVICE:-webapp}
 
-exec docker compose exec $svc "$@"
+exec docker compose exec "${DCEXEC_SERVICE:-webapp}" "$@"

bin/create-external-network.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-
 cd $(dirname $0)/..
-base=$(pwd)
-
-svc=${CLI_SERVICE:-cli}
 
-exec docker compose run --rm $svc "$@"
+exec docker compose run --rm "${DCRUN_SERVICE:-cli}" "$@"

bin/dcexec

@@ -1,6 +1,6 @@
 vars {
-  API_URL: http://api.aspiredev.org
-  DOWNLOADS_URL: http://downloads.aspiredev.org
+  API_URL: http://api.aspirecloud.localhost
+  DOWNLOADS_URL: http://downloads.aspirecloud.localhost
 }
 vars:secret [
   API_KEY

bin/dcrun

@@ -13,11 +13,11 @@ services:
             app-net: ~
             aspire-net:
                 aliases:
-                    - 'api.aspiredev.org'
+                    - 'api.aspirecloud.localhost'
         labels:
             - "traefik.enable=true"
-            - "traefik.http.routers.ap-api.rule=Host(`api.aspiredev.org`)"
-            - "traefik.http.routers.ap-api-https.rule=Host(`api.aspiredev.org`)"
+            - "traefik.http.routers.ap-api.rule=Host(`api.aspirecloud.localhost`)"
+            - "traefik.http.routers.ap-api-https.rule=Host(`api.aspirecloud.localhost`)"
             - "traefik.http.routers.ap-api-https.tls=true"
 
     redis:
@@ -37,7 +37,7 @@ services:
             app-net: ~
             aspire-net:
                 aliases:
-                    - 'db.aspiredev.org'
+                    - 'db.aspirecloud.localhost'
 
     queue-worker:
         build:
@@ -86,7 +86,7 @@ services:
             app-net: ~
             aspire-net:
                 aliases:
-                    - 'mail.aspiredev.org'
+                    - 'mail.aspirecloud.localhost'
         environment:
             MP_MAX_MESSAGES: 500
             MP_SMTP_AUTH_ACCEPT_ANY: 1