Add more modules to phpvms

playbooks/roles/phpvms/defaults/main.yml

@@ -84,10 +84,13 @@ phpvms_compose_base:
         user: "${WWWUSER:-1000}:${WWWGROUP:-1000}"
         image: "{{ phpvms_docker_image }}"
         restart: always
-        command: sh -c "sed -i
+        command: sh -c "
-          's/Paginator::useBootstrap();/Paginator::useBootstrap();
+          sed -i
-          \\\\Illuminate\\\\Support\\\\Facades\\\\URL::forceScheme(\"https\");/'
+            's/Paginator::useBootstrap();/Paginator::useBootstrap();
-          app/Providers/AppServiceProvider.php && php-fpm"
+            \\\\Illuminate\\\\Support\\\\Facades\\\\URL::forceScheme(\"https\");/'
+            app/Providers/AppServiceProvider.php
+          && cp -r /var/www/html/resources_in/* /var/www/html/resources
+          && php-fpm"
         environment:
           PHP_OPCACHE_ENABLE: 1
           # some basic laravel stuff
@@ -95,8 +98,8 @@ phpvms_compose_base:
         env_file: .env
         volumes:
           - ./public/:/var/www/html/public:rw
-          - ./modules:/var/www/html/modules:ro
+          - ./modules:/var/www/html/modules:rw
-          - ./public/uploads:/var/www/html/public/uploads:rw
+          - ./resources:/var/www/html/resources_in:rw
           - ./storage:/var/www/html/storage:rw
         depends_on:
           - mariadb
@@ -118,7 +121,7 @@ phpvms_compose_base:
         env_file: .env
         volumes:
           - ./modules:/var/www/html/modules:ro
-          - ./public/uploads:/var/www/html/public/uploads:rw
+          - ./public/:/var/www/html/public:rw
           - ./storage:/var/www/html/storage:rw
         networks:
           default:
@@ -137,7 +140,7 @@ phpvms_compose_base:
         env_file: .env
         volumes:
           - ./modules:/var/www/html/modules:ro
-          - ./public/uploads:/var/www/html/public/uploads:rw
+          - ./public/:/var/www/html/public:rw
           - ./storage:/var/www/html/storage:rw
         networks:
           default:

playbooks/roles/phpvms/files/.gitignore

@@ -1 +1,3 @@
+phpvms7_SPTheme.tar.gz
+phpvms7_SPTheme_DSPack.tar.gz
 vmsacars.tar.gz

playbooks/roles/phpvms/tasks/main.yml

@@ -24,16 +24,14 @@
         group: "{{ phpvms_gid }}"
       become: true
 
-    # You must provide this file yourself.
+    - name: Create resources_in directory
-    - name: Load VMSArcas module
+      ansible.builtin.file:
-      ansible.builtin.unarchive:
+        path: "{{ (service_path, 'resources') | path_join }}"
-        src: vmsacars.tar.gz
+        state: directory
-        dest: "{{ (service_path, 'modules') | path_join }}"
+        mode: "0755"
         owner: "{{ phpvms_uid }}"
         group: "{{ phpvms_gid }}"
       become: true
-      notify: Restart service {{ service_name }}
-      when: service_name == role_name # Only use on "main" instance
 
     - name: Template Caddyfile
       ansible.builtin.template:
@@ -44,3 +42,61 @@
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml
+
+    # You must provide this file yourself.
+    - name: Load VMSArcas module
+      ansible.builtin.unarchive:
+        src: vmsacars.tar.gz
+        dest: "{{ (service_path, 'modules') | path_join }}"
+        owner: "{{ phpvms_uid }}"
+        group: "{{ phpvms_gid }}"
+      become: true
+      notify: Restart service {{ service_name }}
+      when: service_name == role_name # Only use on the "main" instance
+
+    - name: Load DisposableBasic
+      ansible.builtin.unarchive:
+        src: https://github.com/FatihKoz/DisposableBasic/releases/download/v3.7.4/DisposableBasic.zip
+        remote_src: true
+        dest: "{{ (service_path, 'modules') | path_join }}"
+        owner: "{{ phpvms_uid }}"
+        group: "{{ phpvms_gid }}"
+      become: true
+      notify: Restart service {{ service_name }}
+
+    - name: Load DisposableSpecial
+      ansible.builtin.unarchive:
+        src: https://github.com/FatihKoz/DisposableSpecial/releases/download/v3.7.8/DisposableSpecial.zip
+        remote_src: true
+        dest: "{{ (service_path, 'modules') | path_join }}"
+        owner: "{{ phpvms_uid }}"
+        group: "{{ phpvms_gid }}"
+      become: true
+      notify: Restart service {{ service_name }}
+
+    # You must provide this file yourself.
+    - name: Load SPTheme
+      ansible.builtin.unarchive:
+        src: phpvms7_SPTheme.tar.gz
+        dest: "{{ service_path }}"
+        include:
+          - modules
+          - public
+          - resources
+        owner: "{{ phpvms_uid }}"
+        group: "{{ phpvms_gid }}"
+      become: true
+      notify: Restart service {{ service_name }}
+
+    # You must provide this file yourself.
+    - name: Load SPTheme DSPack
+      ansible.builtin.unarchive:
+        src: phpvms7_SPTheme_DSPack.tar.gz
+        dest: "{{ service_path }}"
+        include:
+          - public
+          - resources
+        owner: "{{ phpvms_uid }}"
+        group: "{{ phpvms_gid }}"
+      become: true
+      notify: Restart service {{ service_name }}

playbooks/roles/phpvms/vars/test.yml

@@ -8,7 +8,7 @@ phpvms_volume_opts:
   - "username={{ opentofu.hcloud_storage_box_accounts.phpvms_test.user }}"
   - "password={{ opentofu.hcloud_storage_box_accounts.phpvms_test.pass }}"
 
-phpvms_test_compose:
+_phpvms_test_compose:
   file:
     services:
       phpvms-app:
@@ -23,7 +23,7 @@ phpvms_test_compose:
         command: |
           bash -c "while true
             do
-              cp -rf /mnt/kondor-virtual_in /mnt/public/kondor-virtual
+              cp -rf /mnt/kondor-virtual_in/* /mnt/public/kondor-virtual
               sleep 60
             done"
         volumes:
@@ -40,4 +40,5 @@ phpvms_test_compose:
           o: "{{ phpvms_volume_opts | join(',') }}"
           device: "//{{ opentofu.hcloud_storage_box_accounts.phpvms_test.host }}/{{ opentofu.hcloud_storage_box_accounts.phpvms_test.user }}"
 
-phpvms_compose: "{{ phpvms_compose_base | combine(phpvms_test_compose, list_merge='append_rp', recursive=true) }}"
+_phpvms_compose: "{{ phpvms_compose_base | combine(phpvms_test_compose, list_merge='append_rp', recursive=true) }}"
+phpvms_compose: "{{ phpvms_compose_base }}"