diff --git a/README.md b/README.md index 16bd09e..ed653ed 100644 --- a/README.md +++ b/README.md @@ -4,21 +4,5 @@ | Prop | Value | | --- | --- | -| Hostname | `h2954114` | -| Domains | `{wiki.,codi.,git.,}pbrinkmeier.de`, `tichy.click`, `h2954114.stratoserver.net` | - -### Personal Website - -[pbrinkmeier.de](https://pbrinkmeier.de) - -### Personal Wiki - -[wiki.pbrinkmeier.de](https://wiki.pbrinkmeier.de) - -### Collaborative Markdown Editing - -[pad.pbrinkmeier.de](https://pad.pbrinkmeier.de) - -### Tichy-Clicker - -[tichy.click](https://tichy.click) +| Hostname | `shamash` | +| Domains | `{,pad.,codi.,ci.,git.,jupyter.,plantuml.}pbrinkmeier.de`, `tichy.click`, `beany.club`, `vmd98928.contaboserver.net` | diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml index 36b254d..a421d99 100644 --- a/ansible/playbooks/misc-docker.yaml +++ b/ansible/playbooks/misc-docker.yaml @@ -47,14 +47,19 @@ state: directory # Hide contents from non-root users mode: u=rwx,g=,o= - - name: Add Notebooks folder + - name: Create jupyter folders become: true ansible.builtin.file: - path: /home/jupyter/Notebooks - owner: jupyter - group: jupyter + path: "/var/lib/pbri/docker/{{ item.name }}" + owner: "{{ item.user }}" + group: "{{ item.user }}" state: directory - mode: 0755 + mode: u=rwx,g=,o= + loop: + - name: jupyter_data + user: jupyter + - name: jupyter_notebooks + user: jupyter - name: Create Factorio data folder become: true ansible.builtin.file: @@ -81,3 +86,5 @@ state: present - name: factorio state: present + - name: jupyter + state: present diff --git a/docker/jupyter/docker-compose.yaml b/docker/jupyter/docker-compose.yaml new file mode 100644 index 0000000..d10060d --- /dev/null +++ b/docker/jupyter/docker-compose.yaml @@ -0,0 +1,15 @@ +version: "3" + +services: + jupyter: + image: pbri/jup:1.1 + user: "42000" + volumes: + - /var/lib/pbri/docker/jupyter_data:/data + - /var/lib/pbri/docker/jupyter_notebooks:/notebooks + restart: always + +networks: + default: + name: caddy-network + external: true