diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 10c7393e..6c5d3636 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -15,27 +15,29 @@ jobs: working-directory: backend steps: - - name: SSH deploy - uses: appleboy/ssh-action@v1.2.0 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USER }} - key: ${{ secrets.EC2_SSH_KEY }} - port: ${{ secrets.EC2_PORT || 22 }} - script: | - set -e - - # Adjust if your repo path is different - cd /home/deploy/Stratus - - git fetch --all - git reset --hard origin/main - - cd backend - npm ci - npm run build - - pm2 restart stratus-api - pm2 save - - pm2 status + - run: exit 0 # no-op + + # - name: SSH deploy + # uses: appleboy/ssh-action@v1.2.0 + # with: + # host: ${{ secrets.EC2_HOST }} + # username: ${{ secrets.EC2_USER }} + # key: ${{ secrets.EC2_SSH_KEY }} + # port: ${{ secrets.EC2_PORT || 22 }} + # script: | + # set -e + # + # # Adjust if your repo path is different + # cd /home/deploy/Stratus + # + # git fetch --all + # git reset --hard origin/main + # + # cd backend + # npm ci + # npm run build + # + # pm2 restart stratus-api + # pm2 save + # + # pm2 status diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index d9634f4a..5fab760e 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -32,16 +32,16 @@ jobs: ./games/build-supertuxkart.sh games/build/c3770c11-ecaf-4852-96b0-37269736a6fc rm games/build/sleep -f - - name: Setup AWS CLI - if: github.ref == 'refs/heads/main' - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ secrets.AWS_REGION }} - - - name: Upload games to S3 bucket - if: github.ref == 'refs/heads/main' - run: aws s3 sync games/build 's3://${{ vars.AWS_GAMES_BUCKET }}' - # Note: we don't pass --delete, so manually-uploaded games will not be - # removed from the bucket + # - name: Setup AWS CLI + # if: github.ref == 'refs/heads/main' + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: ${{ secrets.AWS_REGION }} + # + # - name: Upload games to S3 bucket + # if: github.ref == 'refs/heads/main' + # run: aws s3 sync games/build 's3://${{ vars.AWS_GAMES_BUCKET }}' + # # Note: we don't pass --delete, so manually-uploaded games will not be + # # removed from the bucket diff --git a/.github/workflows/os.yml b/.github/workflows/os.yml index 719d15f6..49fd3f8e 100644 --- a/.github/workflows/os.yml +++ b/.github/workflows/os.yml @@ -48,14 +48,14 @@ jobs: cp os/install.sh os/repo repo-add os/repo/stratus.db.tar.zst os/repo/*.pkg.tar.zst - - name: Setup AWS CLI - if: github.ref == 'refs/heads/main' - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ secrets.AWS_REGION }} - - - name: Upload stratus Arch repository to S3 bucket - if: github.ref == 'refs/heads/main' - run: aws s3 sync os/repo 's3://${{ vars.AWS_OS_BUCKET }}' --delete + # - name: Setup AWS CLI + # if: github.ref == 'refs/heads/main' + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: ${{ secrets.AWS_REGION }} + # + # - name: Upload stratus Arch repository to S3 bucket + # if: github.ref == 'refs/heads/main' + # run: aws s3 sync os/repo 's3://${{ vars.AWS_OS_BUCKET }}' --delete diff --git a/README.md b/README.md index 840cfc1d..c4af927f 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,15 @@ architecture of Stratus. ## Deployment +To deploy an entire fully-featured Stratus instance from scratch, follow the +instructions below. Alternatively, it is possible to run just the Stratus +streaming server and connect via our [Direct Connect][direct-connect] page +without any additional setup (no Google OAuth, AWS DynamoDB, coordination +server, etc) by following the instructions [here][stratusd-setup]. + +[direct-connect]: https://www.playstratus.io/direct-connect +[stratusd-setup]: https://github.com/PlayStratus/Stratus/blob/main/stratusd/README.md#development-setup + 1. **Google OAuth:** Register a Google OAuth client and obtain the access credentials (client ID and secret). @@ -101,15 +110,8 @@ architecture of Stratus. a stream session. -## Project Authors - -Stratus was developed by a team of Oregon State University students as a -capstone project. - - diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx index 042d24ec..b197723b 100644 --- a/frontend/src/app/page.tsx +++ b/frontend/src/app/page.tsx @@ -65,7 +65,7 @@ export default async function Home() { > Play now! - (closed beta) + (unavailable) ) : ( diff --git a/frontend/src/components/landingPage/Faq.tsx b/frontend/src/components/landingPage/Faq.tsx index f631c763..dd85ee27 100644 --- a/frontend/src/components/landingPage/Faq.tsx +++ b/frontend/src/components/landingPage/Faq.tsx @@ -29,7 +29,7 @@ const faqs = [ { question: "Is Stratus available to the public?", answer: - "Stratus is currently only available to students at Oregon State University. We unfortunately have no plans to expand access due to hosting costs and complexities.", + "Stratus is no longer hosted publicly due to various costs and complexities. However, you can still run a Stratus server locally and connect via the Direct Connect page." }, ]