diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index f249f64..20187f1 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -25,32 +25,32 @@ jobs: - name: Zip the folder run: zip -r archive.zip . -x "./.git/*" "./.github/*" - - name: Deploy via SSH - uses: appleboy/scp-action@v0.1.7 + - name: Prepare folder for upload + run: | + mkdir .compress + mv archive.zip .compress/. + cd .compress + echo "open('archive.zip')===TRUE && $$z->extractTo('.') && $$z->close(); unlink('archive.zip'); unlink('update.php') ?>" > update.php + echo "INTERFACE_EDITOR_URL=https://dev.json.ms" > .env + echo "ACCESS_CONTROL_ALLOW_ORIGIN=https://dev.json.ms" >> .env + echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env + echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env + echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env + echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.dev.json.ms/google/callback" >> .env + echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env + echo "DATABASE_DBNAME=${{ secrets.DATABASE_DEV_DBNAME }}" >> .env + echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env + echo "DATABASE_PASSWORD=\"${{ secrets.DATABASE_PASSWORD }}\"" >> .env + + - name: FTP Deploy + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 with: - host: ${{ secrets.FTP_SERVER }} + server: ${{ secrets.FTP_SERVER }} username: ${{ secrets.FTP_USERNAME }} password: ${{ secrets.FTP_PASSWORD }} - source: "archive.zip" - target: ${{ secrets.FTP_SERVER_DEV_PATH }} + local-dir: .compress/ + server-dir: ${{ secrets.FTP_SERVER_DEV_PATH }} + protocol: ftps - - name: SSH into server and unzip - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.FTP_SERVER }} - username: ${{ secrets.FTP_USERNAME }} - password: ${{ secrets.FTP_PASSWORD }} - script: | - cd ${{ secrets.FTP_SERVER_DEV_PATH }} - unzip -o archive.zip -d . - rm archive.zip - echo "INTERFACE_EDITOR_URL=https://dev.json.ms" > .env - echo "ACCESS_CONTROL_ALLOW_ORIGIN=https://dev.json.ms" >> .env - echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env - echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env - echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env - echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.dev.json.ms/google/callback" >> .env - echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env - echo "DATABASE_DBNAME=${{ secrets.DATABASE_DEV_DBNAME }}" >> .env - echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env - echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env + - name: Send JSON request + run: curl -k -X POST https://server.dev.json.ms/update.php diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 491c771..aff7160 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -25,32 +25,32 @@ jobs: - name: Zip the folder run: zip -r archive.zip . -x "./.git/*" "./.github/*" - - name: Deploy via SSH - uses: appleboy/scp-action@v0.1.7 + - name: Prepare folder for upload + run: | + mkdir .compress + mv archive.zip .compress/. + cd .compress + echo "open('archive.zip')===TRUE && $$z->extractTo('.') && $$z->close(); unlink('archive.zip'); unlink('update.php') ?>" > update.php + echo "INTERFACE_EDITOR_URL=https://dev.json.ms" > .env + echo "ACCESS_CONTROL_ALLOW_ORIGIN=https://dev.json.ms" >> .env + echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env + echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env + echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env + echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.dev.json.ms/google/callback" >> .env + echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env + echo "DATABASE_DBNAME=${{ secrets.DATABASE_PROD_DBNAME }}" >> .env + echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env + echo "DATABASE_PASSWORD=\"${{ secrets.DATABASE_PASSWORD }}\"" >> .env + + - name: FTP Deploy + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 with: - host: ${{ secrets.FTP_SERVER }} + server: ${{ secrets.FTP_SERVER }} username: ${{ secrets.FTP_USERNAME }} password: ${{ secrets.FTP_PASSWORD }} - source: "archive.zip" - target: ${{ secrets.FTP_SERVER_PROD_PATH }} + local-dir: .compress/ + server-dir: ${{ secrets.FTP_SERVER_PROD_PATH }} + protocol: ftps - - name: SSH into server and unzip - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.FTP_SERVER }} - username: ${{ secrets.FTP_USERNAME }} - password: ${{ secrets.FTP_PASSWORD }} - script: | - cd ${{ secrets.FTP_SERVER_PROD_PATH }} - unzip -o archive.zip -d . - rm archive.zip - echo "INTERFACE_EDITOR_URL=https://json.ms" > .env - echo "ACCESS_CONTROL_ALLOW_ORIGIN=https://json.ms" >> .env - echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env - echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env - echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env - echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.json.ms/google/callback" >> .env - echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env - echo "DATABASE_DBNAME=${{ secrets.DATABASE_PROD_DBNAME }}" >> .env - echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env - echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env + - name: Send JSON request + run: curl -k -X POST https://server.json.ms/update.php diff --git a/README.md b/README.md index a1c0980..5a9714a 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ Follow these steps to set up and run the project locally: ### 1. Prepare the MySQL Database -A `.datatable.sql` file is included in the project. +A `datatable.sql` file is included in the project. It contains the necessary schema definitions required to run the application. To set up your database: ```bash -mysql -u your_user -p your_database_name < .datatable.sql +mysql -u your_user -p your_database_name < datatable.sql ``` Replace your_user and your_database_name with your MySQL username and target database name. diff --git a/.datatable.sql b/datatable.sql similarity index 100% rename from .datatable.sql rename to datatable.sql