From e3601faf8e98ac39be1aa746c9e20b837d09a037 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Mon, 4 May 2026 15:26:43 +0700 Subject: feat: integrate general use favicon.ico for search engines ci: use ansible dev tools to speed up deploy step --- .github/workflows/build-and-deploy-prod.yml | 26 +++++++++++++++++++++-- .github/workflows/build-and-deploy-stage.yml | 30 ++++++++++++++++++++------- .gitignore | 2 ++ static/favicon.ico | Bin 0 -> 7633 bytes views/layouts/general-page.html | 5 +++++ views/pages/global-map.html | 5 +++++ views/pages/unsubscribe-page.html | 5 +++++ 7 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 static/favicon.ico diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 97afdf7..ded8c93 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -50,10 +50,16 @@ jobs: runs-on: ubuntu-latest environment: Production needs: [build-and-push] + container: + image: ghcr.io/ansible/community-ansible-dev-tools:v26.4.6 + options: --user root steps: - name: Checkout uses: actions/checkout@v6 + - name: Install community.docker collection + run: ansible-galaxy collection install community.docker + - name: Set up SSH connection for uz.saya.casa run: | mkdir -p ~/.ssh @@ -77,7 +83,23 @@ jobs: - name: Run Ansible playbook env: - ANSIBLE_HOST_KEY_CHECKING: False + ANSIBLE_HOST_KEY_CHECKING: "False" working-directory: ./deploy run: | - ansible-playbook -i inventory.yml -l prod playbook.yml --private-key ~/.ssh/id_ed25519 -u svc_github -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" -e saya_today_web_environment=prod -e saya_today_web_tag=${{ github.ref_name }} -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" -e saya_today_google_site_verification="${{ secrets.GOOGLE_SITE_VERIFICATION }}" -e saya_today_yandex_verification="${{ secrets.YANDEX_VERIFICATION }}" + ansible-playbook \ + -i inventory.yml \ + -l prod playbook.yml \ + --private-key ~/.ssh/id_ed25519 \ + -u svc_github \ + -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" \ + -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" \ + -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" \ + -e saya_today_web_environment=prod \ + -e saya_today_web_tag=${{ github.ref_name }} \ + -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" \ + -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" \ + -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" \ + -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" \ + -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" \ + -e saya_today_google_site_verification="${{ secrets.GOOGLE_SITE_VERIFICATION }}" \ + -e saya_today_yandex_verification="${{ secrets.YANDEX_VERIFICATION }}" diff --git a/.github/workflows/build-and-deploy-stage.yml b/.github/workflows/build-and-deploy-stage.yml index ffee091..93a2627 100644 --- a/.github/workflows/build-and-deploy-stage.yml +++ b/.github/workflows/build-and-deploy-stage.yml @@ -52,10 +52,16 @@ jobs: runs-on: ubuntu-latest environment: Stage needs: [build-and-push] + container: + image: ghcr.io/ansible/community-ansible-dev-tools:v26.4.6 + options: --user root steps: - name: Checkout uses: actions/checkout@v6 + - name: Install community.docker collection + run: ansible-galaxy collection install community.docker + - name: Set up SSH connection for uz.saya.casa run: | mkdir -p ~/.ssh @@ -71,19 +77,27 @@ jobs: run: | ssh -o ConnectTimeout=10 -i ~/.ssh/id_ed25519 svc_github@uz.saya.casa "echo 'SSH connection successful'" - - name: Install Ansible - shell: bash - run: | - sudo apt update - sudo apt install -y ansible - - name: Set github short sha id: ghss_vars run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Run Ansible playbook env: - ANSIBLE_HOST_KEY_CHECKING: False + ANSIBLE_HOST_KEY_CHECKING: "False" working-directory: ./deploy run: | - ansible-playbook -i inventory.yml -l stage playbook.yml --private-key ~/.ssh/id_ed25519 -u svc_github -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" -e saya_today_web_environment=stage -e saya_today_web_tag=commit-${{ steps.ghss_vars.outputs.sha_short }} -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" + ansible-playbook \ + -i inventory.yml \ + -l stage playbook.yml \ + --private-key ~/.ssh/id_ed25519 \ + -u svc_github \ + -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" \ + -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" \ + -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" \ + -e saya_today_web_environment=stage \ + -e saya_today_web_tag=commit-${{ steps.ghss_vars.outputs.sha_short }} \ + -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" \ + -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" \ + -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" \ + -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" \ + -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" diff --git a/.gitignore b/.gitignore index b5ae410..a620479 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ config*.json .envrc /.ansible + +.DS_Store diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..99d5fbf Binary files /dev/null and b/static/favicon.ico differ diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 98cbfcf..5cf870f 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -43,6 +43,11 @@ type="image/svg+xml" media="(prefers-color-scheme: dark)" /> + {{- with .LinkedData }}