Skip to content

Commit 06e837f

Browse files
committed
fix: ci/cd
1 parent be98ef2 commit 06e837f

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/ansible.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ jobs:
1818
with:
1919
ssh-private-key: ${{ secrets.VYRIA_SSH_PRIVATE_KEY }}
2020

21+
- name: Tailscale
22+
uses: tailscale/github-action@v3
23+
with:
24+
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
25+
args: --login-server=${{ secrets.TAILSCALE_URL }}
26+
2127
- name: Add known hosts
22-
run: ssh-keyscan -H "vyria.phy0.in" >> ~/.ssh/known_hosts
28+
run: ssh-keyscan -H "vyria" >> ~/.ssh/known_hosts
2329

2430
- name: Set up Python
2531
uses: actions/setup-python@v5
@@ -29,15 +35,10 @@ jobs:
2935
- name: Install Ansible
3036
run: pip install ansible
3137

32-
- name: Tailscale
33-
uses: tailscale/github-action@v3
34-
with:
35-
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
36-
3738
- name: Run Ansible playbook
3839
run: |
3940
ansible-playbook \
40-
-i "vyria.phy0.in," \
41+
-i "vyria," \
4142
--extra-vars "ansible_user=${{ secrets.ANSIBLE_USER }} ansible_port=${{ secrets.ANSIBLE_PORT }}" \
4243
--extra-vars "ansible_hashi_vault_url=${{ secrets.ANSIBLE_HASHI_VAULT_URL }} ansible_hashi_vault_token=${{ secrets.ANSIBLE_HASHI_VAULT_TOKEN }}" \
4344
--extra-vars "ansible_sudo_pass=${{ secrets.ANSIBLE_SUDO_PASS }}" \

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ cloudflare-api-token.yml
3030
# Miscellaneous
3131
.vscode
3232
.ansible
33-
router/
33+
router/
34+
docker/homepage/nginx.conf

docker/homepage/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
proxy: # need this cause homepage doesn't support basic auth on caldav
1818
image: nginx:alpine
1919
volumes:
20-
- ./nginx.conf:/etc/nginx/nginx.conf:ro
20+
- ${DATA_PATH:?}/nginx.conf:/etc/nginx/nginx.conf:ro
2121
ports:
2222
- "3001:80"
2323
restart: unless-stopped

0 commit comments

Comments
 (0)