diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b3163cc..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index b2e602e..fa17097 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -12,11 +12,11 @@ jobs: uses: appleboy/ssh-action@master with: host: www2.freezone.ourworld.tf - username: webuser + username: ${{ secrets.TF_USER }} key: ${{ secrets.TF_SECRET }} - port: 34022 + port: ${{ secrets.TF_PORT }} script: | - cd websites/www2/www_ourzone/ + cd websites/www2/www_ourworld_freezone/ git log -1 git fetch git reset --hard origin/development diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 8353d74..7cebb4b 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -12,11 +12,11 @@ jobs: uses: appleboy/ssh-action@master with: host: freezone.ourworld.tf - username: webuser + username: ${{ secrets.TF_USER }} key: ${{ secrets.TF_SECRET }} - port: 34022 + port: ${{ secrets.TF_PORT }} script: | - cd websites/www_ourzone/ + cd websites/www_ourworld_freezone/ git log -1 git fetch git reset --hard origin/master