Обновить jeyerp-stable.yaml

jeyerp-stable.yaml

@@ -4,7 +4,7 @@ image:
 source:
   downloader: alpinelinux-http
   same_as: 3.12
-  url: https://dl-cdn.alpinelinux.org/alpine/
+  url: https://mirror.csclub.uwaterloo.ca/alpine/
   keys:
     # 0482D84022F52DF1C4E7CD43293ACD0907D9495A
     - |-
@@ -192,21 +192,21 @@ targets:
       filesystem: ext4
 
 files:
-- path: /etc/hostname
+  - path: /etc/hostname
     generator: hostname
 
-- path: /etc/hosts
+  - path: /etc/hosts
     generator: hosts
 
-- generator: fstab
+  - generator: fstab
     types:
       - vm
 
-- generator: incus-agent
+  - generator: incus-agent
     types:
       - vm
 
-- path: /etc/default/grub
+  - path: /etc/default/grub
     generator: dump
     pongo: true
     content: |-
@@ -227,14 +227,14 @@ files:
     types:
       - vm
 
-- path: /etc/network/interfaces
+  - path: /etc/network/interfaces
     generator: dump
     content: |-
       auto eth0
       iface eth0 inet dhcp
       hostname $(hostname)
 
-- path: /etc/inittab
+  - path: /etc/inittab
     generator: dump
     content: |-
       # /etc/inittab
@@ -255,7 +255,7 @@ files:
       # Stuff to do before rebooting
       ::shutdown:/sbin/openrc shutdown
 
-- path: /etc/inittab
+  - path: /etc/inittab
     generator: template
     name: inittab
     content: |-
@@ -273,12 +273,12 @@ files:
       # Stuff to do before rebooting
       ::shutdown:/sbin/openrc shutdown
 
-- name: meta-data
+  - name: meta-data
     generator: cloud-init
     variants:
       - cloud
 
-- name: network-config
+  - name: network-config
     generator: cloud-init
     content: |-
       version: 1
@@ -291,12 +291,12 @@ files:
     variants:
       - cloud
 
-- name: user-data
+  - name: user-data
     generator: cloud-init
     variants:
       - cloud
 
-- name: vendor-data
+  - name: vendor-data
     generator: cloud-init
     variants:
       - cloud
@@ -351,58 +351,24 @@ packages:
         - mariadb-client
         - mariadb-connector-c-dev
         - mariadb-dev
-    action: install
-#    variants:
-#    - mariadb
-
-  - packages:
         - redis
-    action: install
-#    variants:
-#    - redis
-
-  - packages:
-#    - python3-dev
-#    - py3-setuptools
-#    - py3-pip
-#    - py3-distutils-extra
-#    - py3-virtualenv
         - uv
-    action: install
-#    variants:
-#    - python3
-
-  - packages:
         - alpine-sdk
         - cronie
         - curl
         - wget
-    - nano
         - linux-headers
-    - ansible
-    - fail2ban
         - bash
         - tzdata
-    action: install
-#    variants:
-#    - dependencies
-
-  - packages:
         - nginx
-    action: install
-#    variants:
-#    - nginx
-
-  - packages:
         - nodejs
         - npm
         - yarn
+        - chromium-headless-shell
       action: install
-#    variants:
-#    - nodejs
 
 actions:
-- trigger: post-unpack
+  - trigger: post-unpack
     action: |-
       #!/bin/sh
       set -eux
@@ -411,14 +377,14 @@ actions:
     types:
       - vm
 
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
 
       rm -f /var/cache/apk/*
 
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -440,14 +406,22 @@ actions:
     types:
       - container
 
-- trigger: post-packages
+  - trigger: post-unpack
+    action: |-
+      #!/bin/sh
+      set -eux
+
+      addgroup -S -g 1001 mysql 2>/dev/null
+      adduser  -S -D -H -u 1001 -G mysql -h /var/lib/mysql -s /sbin/nologin mysql 2>/dev/null
+
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
 
       setup-user frappe
 
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -463,9 +437,8 @@ actions:
       }
 
       server {
-        listen 80 default_server;
-        server_name _;
-
+          listen 80;
+          server_name $host;
           root /home/frappe/frappe-bench/sites;
 
           proxy_buffer_size 128k;
@@ -488,7 +461,7 @@ actions:
 
           location ~ ^/protected/(.*) {
               internal;
-            try_files /frontend/$1 =404;
+              try_files /$host/$1 =404;
           }
 
           location /socket.io {
@@ -497,7 +470,7 @@ actions:
               proxy_set_header Connection "upgrade";
               proxy_set_header X-Frappe-Site-Name frontend;
               proxy_set_header Origin $scheme://$http_host;
-            proxy_set_header Host frontend;
+              proxy_set_header Host $host;
 
               proxy_pass http://socketio-server;
           }
@@ -507,12 +480,12 @@ actions:
               rewrite ^(.+)/index\.html$ $1 permanent;
               rewrite ^(.+)\.html$ $1 permanent;
 
-            location ~ ^/files/.*\.(htm|html|svg|xml)$ {
+              location ~ ^/files/.*.(htm|html|svg|xml) {
                   add_header Content-disposition "attachment";
-                try_files /frontend/public/$uri @webserver;
+                  try_files /$host/public/$uri @webserver;
               }
 
-            try_files /frontend/public/$uri @webserver;
+              try_files /$host/public/$uri @webserver;
           }
 
           location @webserver {
@@ -520,7 +493,7 @@ actions:
               proxy_set_header X-Forwarded-For $remote_addr;
               proxy_set_header X-Forwarded-Proto $scheme;
               proxy_set_header X-Frappe-Site-Name frontend;
-            proxy_set_header Host frontend;
+              proxy_set_header Host $host;
               proxy_set_header X-Use-X-Accel-Redirect True;
               proxy_read_timeout 120;
               proxy_redirect off;
@@ -557,15 +530,11 @@ actions:
               text/css
               text/plain
               text/x-component;
+              # text/html is always compressed by HttpGzipModule
       }
       EOF
 
-    # Runlevel Nginx
-    rc-update add nginx        
-#    variants:
-#    - nginx
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -597,24 +566,9 @@ actions:
       done
 
       # Initialize MariaDB
-    mariadb-secure-installation <<EOF
+      mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'admin';"
 
-    y
-    y
-    $DISTROBUILDER_ROOT_UUID
-    $DISTROBUILDER_ROOT_UUID
-    y
-    y
-    y
-    y
-    EOF
-    echo "MariaDB password is: $DISTROBUILDER_ROOT_UUID"
-    # Runlevel MariaDB
-    rc-update add mariadb default        
-#  variants:
-#  - mariadb
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -628,10 +582,11 @@ actions:
       # Change User Directory Permissions
       su frappe -c 'chmod -R o+rx /home/frappe'
       # Setup Redis Config
-    su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_cache redis://localhost:6379'
-    su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_queue redis://localhost:6379'
-    su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_socketio redis://localhost:6379'
+      su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_cache redis://127.0.0.1:6379'
+      su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_queue redis://127.0.0.1:6379'
+      su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g redis_socketio redis://127.0.0.1:6379'
       su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -gp socketio_port 9000'
+      su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench set-config -g chromium_path /usr/bin/chromium-headless-shell'
       # Starting Redis
       nohup redis-server >/dev/null 2>&1 &
       echo "Waiting for Redis to Start..."
@@ -642,8 +597,8 @@ actions:
       su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench get-app --branch=version-16 --resolve-deps erpnext https://github.com/frappe/erpnext'
       su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench get-app --branch=version-16 hrms https://github.com/frappe/hrms'
       #  Create a New Site
-    su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench new-site --admin-password=admin --db-root-username=root --db-root-password="${DISTROBUILDER_ROOT_UUID}" --install-app erpnext --set-default frontend'
-    # Install Standard App
+      su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench new-site --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default frontend'
+      # Install HRMS App
       su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench install-app hrms'
       # Download Jey ERP Apps
       # su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench migrate-csv-to-po'
@@ -663,17 +618,7 @@ actions:
       # Builds JS and CSS, and then migrates
       su frappe -c 'cd /home/frappe/frappe-bench && uvx --from frappe-bench bench migrate && uvx --from frappe-bench bench build'
 
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eux
-
-    # Runlevel Redis
-    rc-update add redis default        
-  variants:
-#  - redis
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -691,13 +636,7 @@ actions:
       command_user="frappe:frappe"
       EOF
 
-    chmod +x /etc/init.d/node
-    rc-update add node default        
-
-#  variants:
-#  - nodejs
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -715,13 +654,7 @@ actions:
       command_user="frappe:frappe"
       EOF
 
-    chmod +x /etc/init.d/gunicorn
-    rc-update add gunicorn default        
-
-#  variants:
-#  - gunicorn
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -739,10 +672,7 @@ actions:
       command_user="frappe:frappe"
       EOF
 
-    chmod +x /etc/init.d/queue-long
-    rc-update add queue-long default        
-
-- trigger: post-packages
+  - trigger: post-packages
     action: |-
       #!/bin/sh
       set -eux
@@ -760,10 +690,52 @@ actions:
       command_user="frappe:frappe"
       EOF
 
+  - trigger: post-packages
+    action: |-
+      #!/bin/sh
+      set -eux
+
+      # Service Frappe Bench Scheduler
+      cat << 'EOF' > /etc/init.d/scheduler
+      #!/sbin/openrc-run
+
+      name="scheduler"
+      description="frappe-bench-scheduler"
+      supervisor="supervise-daemon"
+      command="/usr/bin/uvx"
+      command_args="--from frappe-bench bench schedule"
+      supervise_daemon_args=" -d /home/frappe/frappe-bench -1 /home/frappe/frappe-bench/logs/scheduler.log -2 /home/frappe/frappe-bench/logs/scheduler.error.log"
+      command_user="frappe:frappe"
+      EOF
+
+  - trigger: post-packages
+    action: |-
+      #!/bin/sh
+      set -eux
+
+      # Runlevel Redis
+      rc-update add redis default
+      # Runlevel Nginx
+      rc-update add nginx default
+      # Runlevel MariaDB
+      rc-update add mariadb default
+      # Runlevel SocketIO
+      chmod +x /etc/init.d/node
+      rc-update add node default
+      # Runlevel Gunicorn
+      chmod +x /etc/init.d/gunicorn
+      rc-update add gunicorn default
+      # Service Frappe Queue Long
+      chmod +x /etc/init.d/queue-long
+      rc-update add queue-long default
+      # Service Frappe Queue Short
       chmod +x /etc/init.d/queue-short
       rc-update add queue-short default
+      # Service Frappe Bench Scheduler
+      chmod +x /etc/init.d/scheduler
+      rc-update add scheduler default
 
-- trigger: post-files
+  - trigger: post-files
     action: |-
       #!/bin/sh
       set -eux
@@ -791,7 +763,7 @@ actions:
     types:
       - vm
 
-- trigger: post-files
+  - trigger: post-files
     action: |-
       #!/bin/sh
       set -eux
@@ -803,7 +775,7 @@ actions:
     variants:
       - cloud
 
-- trigger: post-files
+  - trigger: post-files
     action: |-
       #!/bin/sh
       set -eux
@@ -812,7 +784,7 @@ actions:
     variants:
       - cloud
 
-- trigger: post-files
+  - trigger: post-files
     action: |-
       #!/bin/sh
       set -eux