From af9bde0c6a7676d88ece5e1763e2611c4c32aa70 2023-12-14 22:41:24
From: x <xbr@c3l.lu>
Date: 2023-12-14 22:41:24
Subject: [PATCH] fix: finish hugo and api tocuhes

---

diff --git a/web/tasks/api.yml b/web/tasks/api.yml
index 66a8a4040d27e21a31c2e661176083ceb6d472aa..78f147477058135912c124b71324be7e37acd455 100644
--- a/web/tasks/api.yml
+++ b/web/tasks/api.yml
@@ -1,18 +1,27 @@
 ---
 # Setup the API website
-- name: "Make sure api directory exists"
+- name: "Make sure repos directory exists"
   ansible.builtin.file:
-    path: "/var/www/api/"
+    path: "~/public_repos"
     state: directory
     owner: fflux
     group: fflux
-    mode: '0755'
+    mode: '1755'
   become: true
+  become_user: fflux
 - name: "Clone api repo"
   ansible.builtin.git:
     accept_newhostkey: yes
     repo: "ssh://kallithea@projects.c3l.lu/freifunk/web/api"
-    dest: "/var/www/api/"
+    dest: "/home/fflux/public_repos/api/"
     version: "main"
   become: true
   become_user: fflux
+- name: "Symlink to website"
+  ansible.builtin.file:
+    src: "/home/fflux/public_repos/api/public"
+    dest: "/var/www/api"
+    owner: fflux
+    group: fflux
+    state: link
+  become: true
\ No newline at end of file
diff --git a/web/tasks/hugo.yml b/web/tasks/hugo.yml
index 8f2c41ab5aa81c09602a983af93362ee8f82aba1..5f4b1d469e0ad878d234bdb643e953f978c47f3a 100644
--- a/web/tasks/hugo.yml
+++ b/web/tasks/hugo.yml
@@ -11,25 +11,25 @@
   when: "'hugo' not in ansible_facts.packages"
 - name: "Make sure repos directory exists"
   ansible.builtin.file:
-    path: "~/repos"
+    path: "~/public_repos"
     state: directory
     owner: fflux
     group: fflux
-    mode: '1750'
+    mode: '1755'
   become: true
   become_user: fflux
 - name: "Clone website repo"
   ansible.builtin.git:
     accept_newhostkey: true
     repo: "ssh://kallithea@projects.c3l.lu/freifunk/web/website"
-    dest: "/home/fflux/repos/website"
-    version: "main"
+    dest: "/home/fflux/public_repos/website"
+    version: "testing"
   become: true
   become_user: fflux
   register: hugo_website_cloned
 - name: "Build the website"
   ansible.builtin.command:
-    chdir: "/home/fflux/repos/website"
+    chdir: "/home/fflux/public_repos/website"
     cmd: "hugo --minify"
   become: true
   become_user: fflux
@@ -38,7 +38,7 @@
   changed_when: hugo_website_built.rc == 0
 - name: "Symlink to website"
   ansible.builtin.file:
-    src: "/home/fflux/repos/website"
+    src: "/home/fflux/public_repos/website/public"
     dest: "/var/www/website"
     owner: fflux
     group: fflux