This commit is contained in:
2025-06-07 18:18:16 -04:00
parent 236ec455cc
commit d0aff716ff
14 changed files with 434 additions and 109 deletions

View File

@@ -4,12 +4,6 @@
state: restarted
listen: restart_mariadb
- name: Compose up on webserver stack
ansible.builtin.command: "docker-compose up -d"
args:
chdir: "{{ webserver_root }}"
listen: composeup_webserver
- name: Grab Nextcloud container information
community.docker.docker_container_info:
name: "{{ webserver_root | basename }}_nextcloud_1"
@@ -22,11 +16,12 @@
port: 80
listen: composeup_webserver
- name: Check Nextcloud status
ansible.builtin.command: "docker exec --user www-data {{ webserver_root | basename }}_nextcloud_1
php occ status"
listen: composeup_webserver
register: nextcloud_status
# - name: Check Nextcloud status
# ansible.builtin.command:
# "docker exec --user www-data {{ webserver_root | basename }}_nextcloud_1
# php occ status"
# listen: composeup_webserver
# register: nextcloud_status
- name: Import Nextcloud installation handlers
ansible.builtin.import_tasks: nextcloud.yml
@@ -34,3 +29,96 @@
when:
- nextcloud_status.stderr[:26] == "Nextcloud is not installed"
- nextcloud_autoinstall
- name: Import Webserver project handlers
ansible.builtin.import_tasks: webserver.yml
- name: Install webserver docker-compose.yml
ansible.builtin.copy:
src: docker-compose.yml
dest: /home/oci/webserver/compose.yml
mode: "600"
owner: oci
group: oci
notify: Generate systemd service files
#- name: Start podman compose project
# ansible.builtin.command:
# cmd: podman compose up -d
# chdir: /home/oci/webserver
# notify: Generate systemd service files
# become_user: oci
# become: true
# vars:
# ansible_become_user: oci
# environment:
# XDG_RUNTIME_DIR: "/run/user/2000"
# HOME: "/home/oci"
- name: Start podman compose project
ansible.builtin.shell:
cmd: |
source /etc/profile
cd /home/oci/webserver
podman compose up -d
#notify: Generate systemd service files
notify: Debug handler environment
become: true
become_user: oci
become_flags: "-i"
- name: Debug handler environment
ansible.builtin.shell: |
echo "=== HANDLER DEBUG ==="
whoami
id
env | grep -E "(USER|HOME|XDG|SUDO)" | sort
echo "=== PODMAN INFO ==="
podman info --format json | jq '.store.graphRoot, .store.runRoot'
become: true
become_user: oci
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
listen: "Generate systemd service files"
- name: Generate systemd service files
ansible.builtin.command:
cmd: podman generate systemd --new --files --file /home/oci/webserver/compose.yml
chdir: "/home/oci/.config/systemd/user"
notify: Reload systemd user daemon
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
- name: Reload systemd user daemon
ansible.builtin.systemd:
daemon_reload: true
scope: user
notify: Enable systemd user service
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
- name: Enable systemd user service
ansible.builtin.systemd:
name: webserver
enabled: true
scope: user
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"

View File

@@ -0,0 +1,80 @@
#- name: Start podman compose project
# ansible.builtin.command:
# cmd: podman compose up -d
# chdir: /home/oci/webserver
# notify: Generate systemd service files
# become_user: oci
# become: true
# vars:
# ansible_become_user: oci
# environment:
# XDG_RUNTIME_DIR: "/run/user/2000"
# HOME: "/home/oci"
- name: Start podman compose project
ansible.builtin.shell:
cmd: |
source /etc/profile
cd /home/oci/webserver
podman compose up -d
#notify: Generate systemd service files
notify: Debug handler environment
become: true
become_user: oci
become_flags: '-i'
- name: Debug handler environment
ansible.builtin.shell: |
echo "=== HANDLER DEBUG ==="
whoami
id
env | grep -E "(USER|HOME|XDG|SUDO)" | sort
echo "=== PODMAN INFO ==="
podman info --format json | jq '.store.graphRoot, .store.runRoot'
become: true
become_user: oci
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
listen: "Generate systemd service files"
- name: Generate systemd service files
ansible.builtin.command:
cmd: podman generate systemd --new --files --file /home/oci/webserver/compose.yml
chdir: "/home/oci/.config/systemd/user"
notify: Reload systemd user daemon
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
- name: Reload systemd user daemon
ansible.builtin.systemd:
daemon_reload: true
scope: user
notify: Enable systemd user service
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"
- name: Enable systemd user service
ansible.builtin.systemd:
name: webserver
enabled: true
scope: user
become_user: oci
become: true
vars:
ansible_become_user: oci
environment:
XDG_RUNTIME_DIR: "/run/user/2000"
HOME: "/home/oci"