From 0d0ae513f078731ad67c7a029f94642ceb4d8cab Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Thu, 15 Sep 2022 15:16:19 +0200
Subject: [PATCH] Update setup for new VPS shamash

---
 ansible/group_vars/misc/vars.yaml  |  3 ++-
 ansible/inventory                  |  2 +-
 ansible/playbooks/misc-docker.yaml |  3 +++
 ansible/playbooks/misc-setup.yaml  | 18 ++++++++++++++++++
 docker/codi/docker-compose.yaml    |  1 +
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ansible/group_vars/misc/vars.yaml b/ansible/group_vars/misc/vars.yaml
index 7930727..3f64ecc 100644
--- a/ansible/group_vars/misc/vars.yaml
+++ b/ansible/group_vars/misc/vars.yaml
@@ -1,3 +1,4 @@
 ---
-ansible_user: andi
+# Has pw-less sudo
+ansible_user: paul
 ansible_python_interpreter: /usr/bin/python3
diff --git a/ansible/inventory b/ansible/inventory
index 8b9ff42..74ec166 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -1,2 +1,2 @@
 [misc]
-pbrinkmeier.de
+shamash
diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml
index ace7a55..78b99d5 100644
--- a/ansible/playbooks/misc-docker.yaml
+++ b/ansible/playbooks/misc-docker.yaml
@@ -16,6 +16,9 @@
         - name: gitea
           uid: 42001
           state: present
+        - name: hackmd
+          uid: 1500
+          state: present
     # All services that are behind Caddy need to be in this network
     - name: Create Caddy network
       become: true
diff --git a/ansible/playbooks/misc-setup.yaml b/ansible/playbooks/misc-setup.yaml
index f0b8024..f4fdef7 100644
--- a/ansible/playbooks/misc-setup.yaml
+++ b/ansible/playbooks/misc-setup.yaml
@@ -2,6 +2,23 @@
 - name: Basic setup for shamash (packages, Docker, Nix, sshd)
   hosts: misc
   tasks:
+    - name: Create /etc/pbri
+      become: true
+      file:
+        path: /etc/pbri
+        state: directory
+        mode: u=rwx,g=rx,o=rx
+    - name: Create /home/paul/{Sites,Source}
+      become: true
+      file:
+        path: "/home/paul/{{ item }}"
+        state: directory
+        owner: paul
+        group: paul
+        mode: u=rwx,g=rx,o=rx
+      loop:
+        - Sites
+        - Source
     - name: Install basic packages
       become: true
       ansible.builtin.apt:
@@ -51,6 +68,7 @@
 
   handlers:
     - name: Restart sshd
+      become: true
       ansible.builtin.service:
         name: sshd
         state: restarted
diff --git a/docker/codi/docker-compose.yaml b/docker/codi/docker-compose.yaml
index 9d11397..ae037b2 100644
--- a/docker/codi/docker-compose.yaml
+++ b/docker/codi/docker-compose.yaml
@@ -3,6 +3,7 @@ version: "3"
 services:
   codi:
     image: hackmdio/hackmd:2.4.2
+    user: hackmd
     environment:
       CMD_USECDN: "false"
       CMD_DOMAIN: codi.pbrinkmeier.de