Updated

.github/workflows/test_install.yml → .github/workflows/debian_11.yml

@@ -1,4 +1,4 @@
-name: test install
+name: Deployment CI
 
 on:
   push:
@@ -9,7 +9,7 @@ on:
 jobs:
   install-debian:
     runs-on: ubuntu-22.04
-    name: Test install backend on Debian 11
+    name: on Debian 11
     steps:
       - name: Test run server
         uses: UISSH/install-script@latest

.github/workflows/ubuntu_22.04.yml

@@ -0,0 +1,20 @@
+name: Deployment CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  install-ubuntu:
+    runs-on: ubuntu-22.04
+    name: on Ubuntu 22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Init
+        run: sudo bash install.sh
+      - name: Deploy
+        run: |
+          cd /tmp/install-script && \
+          sudo python3 main.py --login_email=root@root.com --db_root_password=root --login_password=root

main.py

@@ -89,7 +89,8 @@ def install_backend():
 
     # download & install frontend
     cmd(f'cd {BACKEND_DIR}/static && wget -q {FRONTEND_URL} -O "django_spa.zip" && rm -rf common spa', 'Download frontend')
-    cmd(f'cd {BACKEND_DIR}/static && unzip django_spa.zip', 'Unzip frontend')
+    cmd(f'cd {BACKEND_DIR}/static && unzip django_spa.zip > /dev/null',
+        'Unzip frontend')
     cmd(f'cd {BACKEND_DIR}/static && mv django_spa common')
     cmd(f'cd {PROJECT_DIR} && rm -rf backend-release-* *.zip', 'Clean...')
 

src/phpmyadmin/phpmyadmin.py

@@ -197,7 +197,7 @@ def d_print(*args, **kwargs):
         print(*args, **kwargs)
 
 
-def install_phpmyadmin() -> (bytes, bytes):
+def install_phpmyadmin():
     """
     https://nginx.org/en/linux_packages.html#Debian
     """
@@ -210,7 +210,7 @@ def install_phpmyadmin() -> (bytes, bytes):
     # """
     _cmd = f"""
     wget -q https://files.phpmyadmin.net/phpMyAdmin/{phpmyadmin_version}/phpMyAdmin-{phpmyadmin_version}-all-languages.tar.gz
-    tar -zxvf phpMyAdmin-{phpmyadmin_version}-all-languages.tar.gz >> /dev/null
+    tar -zxvf phpMyAdmin-{phpmyadmin_version}-all-languages.tar.gz > /dev/null
     mv phpMyAdmin-{phpmyadmin_version}-all-languages /usr/share/phpMyAdmin 
   
     """
@@ -284,14 +284,18 @@ def install_phpmyadmin() -> (bytes, bytes):
     chmod 777 /usr/share/phpMyAdmin/tmp
     chown -R www-data:www-data /usr/share/phpMyAdmin
     systemctl restart nginx 
-    systemctl restart php7.4-fpm
     """
     os.system(_cmd_2)
 
+    php_version = os.popen('php -v').read().split(' ')[1].split('.')[:2]
+    php_version = ".".join(php_version)
+    php_fpm = f'php{php_version}-fpm'
+    os.system(f'systemctl restart {php_fpm}')
+
     return b"\nok", b" "
 
 
-def cmd(run_cmd) -> (bytes, bytes):
+def cmd(run_cmd):
     if callable(run_cmd):
         out = run_cmd()
         return out
@@ -313,7 +317,6 @@ def test():
         _result = f"\n[red]{soft_name} installed failed![/red]"
         print(_result)
         exit(1)
-        return False
 
 
 dependents = "php-json php-mbstring php-xml"