From 7fc08ac0a278a1659854f49934cef26d731e9f86 Mon Sep 17 00:00:00 2001 From: tolerryan <105945216+tolerryan@users.noreply.github.com> Date: Sun, 27 Oct 2024 01:25:23 -0500 Subject: [PATCH] convert bookstack to wikmd and not using docker --- roles/ind/bookstack/cron.vars | 24 --------- roles/ind/wikmd/cron.vars | 25 ++++++++++ .../wikmd-install.yml} | 50 ++++++++++++++----- roles/lib/setup-restic.yml | 6 +-- 4 files changed, 66 insertions(+), 39 deletions(-) delete mode 100644 roles/ind/bookstack/cron.vars create mode 100644 roles/ind/wikmd/cron.vars rename roles/ind/{bookstack/bookstack-install.yml => wikmd/wikmd-install.yml} (58%) diff --git a/roles/ind/bookstack/cron.vars b/roles/ind/bookstack/cron.vars deleted file mode 100644 index 3668ca0..0000000 --- a/roles/ind/bookstack/cron.vars +++ /dev/null @@ -1,24 +0,0 @@ ---- -tasks: - - name: home - job_name: "Daily /home/docker/ Backup" - job_minute: "0" - job_hour: "2" - job_day: "*" - user: "root" - job_command: "/home/restic/restic.sh --backup /home/docker/" - - - name: appdata - job_name: "Daily /data/app Backup" - job_minute: "0" - job_hour: "3" - job_day: "*" - user: "root" - job_command: "/home/docker/restic.sh --backup /data/app " - - name: weeklydb - job_name: "Weekly /data/db Backup" - job_minute: "10" - job_hour: "6" - job_day: "1" - user: "root" - job_command: "systemctl stop docker.service && /home/docker/restic.sh --backup /data/db && systemctl start docker.service " \ No newline at end of file diff --git a/roles/ind/wikmd/cron.vars b/roles/ind/wikmd/cron.vars new file mode 100644 index 0000000..c0972a0 --- /dev/null +++ b/roles/ind/wikmd/cron.vars @@ -0,0 +1,25 @@ +--- +tasks: + #- name: home + # job_name: "Daily /home/docker/ Backup" + # job_minute: "0" + # job_hour: "2" + # job_day: "*" + # user: "root" + # job_command: "/home/restic/restic.sh --backup /home/docker/" + + - name: appdata + job_name: "Daily /data/ Backup" + job_minute: "0" + job_hour: "3" + job_day: "*" + user: "root" + job_command: "/home/docker/restic.sh --backup /data/ " + + - name: weeklydb + job_name: "Weekly /data/ verification" + job_minute: "10" + job_hour: "6" + job_day: "1" + user: "root" + job_command: "/home/docker/restic.sh --verify /data/" \ No newline at end of file diff --git a/roles/ind/bookstack/bookstack-install.yml b/roles/ind/wikmd/wikmd-install.yml similarity index 58% rename from roles/ind/bookstack/bookstack-install.yml rename to roles/ind/wikmd/wikmd-install.yml index ac8206d..b62bb16 100644 --- a/roles/ind/bookstack/bookstack-install.yml +++ b/roles/ind/wikmd/wikmd-install.yml @@ -56,17 +56,43 @@ - name: Setup Restic Cron jobs include: ../../lib/setup-restic-cron.yml - - + - name: Create wikmd user + user: + name: wikmd + uid: 2002 + group: users + state: present + create_home: yes + home: /data + shell: /bin/bash - - name: Write docker-compose.yml - ansible.builtin.copy: - content: "{{ docker_compose_definition }}" - dest: /home/docker/docker-compose.yml - owner: docker - group: docker - mode: u=rw,g=r,o=r + - name: Install Python Packages + apt: + name: + - python3-full + - python3-pip + state: present + update_cache: yes + + - name: setup service + - name: start server, should be afte restore below + - name: + # docker image is broken using manual install method + #- name: Write docker-compose.yml + # ansible.builtin.copy: + # content: "{{ docker_compose_definition }}" + # dest: /home/docker/docker-compose.yml + # owner: docker + # group: docker + # mode: u=rw,g=r,o=r - - name: Start services - community.docker.docker_compose_v2: - project_src: /home/docker/ - register: output \ No newline at end of file + #- name: Start services + # community.docker.docker_compose_v2: + # project_src: /home/docker/ + # register: output + + - name: Restore Wikmd Dir + command: restic --password-file ./.resticpassword -r sftp:misamisa://home/restic/$(hostname) --target /data/wikmd restore latest + args: + chdir: /home/restic + creates: /data/wikmd \ No newline at end of file diff --git a/roles/lib/setup-restic.yml b/roles/lib/setup-restic.yml index 292ef96..a23c2de 100644 --- a/roles/lib/setup-restic.yml +++ b/roles/lib/setup-restic.yml @@ -177,14 +177,14 @@ - name: Create SSH config file copy: - dest: /home/restic/.ssh/config + dest: /root/.ssh/config content: | Hostname misamisa.duckdns.org Port 25456 User restic IdentityFile /home/restic/.ssh/resticuser.ed25519 - owner: restic - group: users + owner: root + group: root mode: '0644' - name: Add known host entry for misamisa