Merge branch 'main' of https://github.com/izadoesdev/mono

Author: Hyteq

.woodpecker/build.yaml

@@ -47,7 +47,6 @@ steps:
       diff: false
       inventory: infrastructure/inventory.ini
       syntax_check: false
-      user: root
       private_key:
         from_secret: ansible_private_key
       galaxy: infrastructure/requirements.yaml

infrastructure/ansible-key.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBke7DXMRx2oFNT8DSKOSnKijJ27B19OCJnk3+K0LiYgzEqqSfD52nn3QlL3f1VPF5MWXWYvZEfXvZCkh0zxkTged1W74Ws68S8wZMA7WJNWoEcZ09Qw5QDkR1dIAUic8Lv+d3R2RL6SRlfd92EvGnLMdMrs5aMnu+R8JmgtG92EEHCXrZoxPtqvnNSLal7MYze7MabjsT9FzjSSKFra3c/LzDcvTPeddERegIXQGAyoVR84IOJh6MxeVGg/i9HyLBz35AkScnsbCF7bwX6bYL7/tzt9VZVbMLiP/Uv07Xncn8jxZI0BLloUYjgLcRLQOzbCnuGeVLAurecPnOKmp/a0AhQnqdS4AsmMturQ096Jr2bHZpiRVKW1st3YWM4Frs8CQrksuiRmge1ip+R4uaX65mBD5tV4UsV0s6yXa/9vT9uznT5pstjp3yQMl3bLD/CnN8x6CysK75TQ4zcASTyXUFfrbzVLQlpBn6RhY/CEb0WloHfLdrAisZ/wm4+c2caE6/6qfgITUH+KxVnibDmBbkDnNySBzPhYEdcMziplwCYoIv9k2jP1FWwgpn0KA1zd++LrdGdgvXCX7izuF42WmLqQ0zZ76FlWudmXnDZy/tKyd5lB6Etl4oROlzyGTEF6ZmEHV4lmddGA7YT52Eh5Xo/htURhkcrmVfFTirXw== root@tool001
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAFCrdjQT9kmCHx6JL95tp7ZMN7xO+xqCVWxa/iloGxo root@tool001

infrastructure/ci/deploy-ci.yaml

@@ -18,7 +18,7 @@
     woodpecker_github_client_id: "Ov23ctD4OqYIRfs7TS2n"
     woodpecker_github_client_secret: "c74a1df9ba42d3e16fc96dc7c7739f97347f66a8"
     woodpecker_agent_secret: "1eed3577eafef3faad25cf073c3c5cc8e479d7f1950280e0c48fc472059cd094"
-    woodpecker_plugins_privileged: woodpeckerci/plugin-docker-buildx:6.0.0
+    woodpecker_plugins_privileged: woodpeckerci/plugin-docker-buildx:6.0.0,woodpeckerci/plugin-ansible
     #woodpecker agent vars
 
   tasks:

infrastructure/deploy/docker-compose.yaml

@@ -1,20 +1,20 @@
 x-databuddy-env:
   &databuddy-env
     CLICKHOUSE_URL: "http://databuddy:databuddy@localhost:8123/database=databuddy "
-    IPINFO_TOKEN: {{ipinfo_token}} # secret
-    REDIS_URL: redis://redis:6379
-    QUEUE_REDIS_URL: redis://redis:6379
-    AI_API_KEY: {{ai_api_key}} # secret
-    BETTER_AUTH_SECRET: {{better_auth_secret}} # secret
-    BETTER_AUTH_URL: {{better_auth_url}} 
-    GITHUB_CLIENT_ID: {{github_client_id}} 
-    GITHUB_CLIENT_SECRET: {{github_client_secret}}  # secret
-    GOOGLE_CLIENT_ID: {{google_client_id}}
-    GOOGLE_CLIENT_SECRET: {{google_client_secret}} # secret
-    DATABASE_URL: postgresql://databuddy:databuddy@pgsql:5432/databuddy
-    OPR_API_KEY: {{opr_api_key}} # secret
-    NEXT_PUBLIC_API_URL: https://{{api_host}}
-    NEXT_PUBLIC_BASKET_URL: https://{{basket_host}}
+    IPINFO_TOKEN: "{{ipinfo_token}}" # secret
+    REDIS_URL: "redis://redis:6379"
+    QUEUE_REDIS_URL: "redis://redis:6379"
+    AI_API_KEY: "{{ai_api_key}}" # secret
+    BETTER_AUTH_SECRET: "{{better_auth_secret | regex_replace('\\$', '\\$\\$')}}" # secret
+    BETTER_AUTH_URL: "{{better_auth_url}}" 
+    GITHUB_CLIENT_ID: "{{github_client_id}}"
+    GITHUB_CLIENT_SECRET: "{{github_client_secret}}"  # secret
+    GOOGLE_CLIENT_ID: "{{google_client_id}}"
+    GOOGLE_CLIENT_SECRET: "{{google_client_secret}}" # secret
+    DATABASE_URL: "postgresql://databuddy:databuddy@pgsql:5432/databuddy"
+    OPR_API_KEY: "{{opr_api_key}}" # secret
+    NEXT_PUBLIC_API_URL: "https://{{api_host}}"
+    NEXT_PUBLIC_BASKET_URL: "https://{{basket_host}}"
     PORT: 3000
     DEBUG: 0