Fix fqdn

lbr38 · Dec 17, 2024 · 56400af · 56400af
1 parent 1294898
commit 56400af
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 107 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -2,10 +2,7 @@ name: Build and test deb package for linupdate
 
 on:
   push:
-    branches: [ devel ]
-  pull_request:
-    push:
-      branches: [ main ]
+    branches: [ linupdate-2.x.x ]
 
 jobs:
   build-deb:
@@ -17,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -81,6 +80,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -96,18 +97,18 @@ jobs:
           apt-get update -y
           apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install package on Debian 11
   install-debian-11:
@@ -121,6 +122,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -136,18 +139,18 @@ jobs:
           apt-get update -y
           apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install package on Debian 12
   install-debian-12:
@@ -161,6 +164,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -176,18 +181,18 @@ jobs:
           apt-get update -y
           apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install package on Ubuntu (latest)
   install-ubuntu:
@@ -198,6 +203,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -213,15 +220,15 @@ jobs:
           sudo apt-get update -y
           sudo apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
-      - name: Test some params
-        run: |
-          sudo /opt/linupdate/linupdate --help
-          sudo /opt/linupdate/linupdate --version
-          sudo /opt/linupdate/linupdate --check-updates
-          sudo /opt/linupdate/linupdate --profile container
-          sudo /opt/linupdate/linupdate --env test
-          sudo /opt/linupdate/linupdate --mod-enable reposerver
-          sudo /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          sudo /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          sudo /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          sudo /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     sudo /opt/linupdate/linupdate --help
+      #     sudo /opt/linupdate/linupdate --version
+      #     sudo /opt/linupdate/linupdate --check-updates
+      #     sudo /opt/linupdate/linupdate --profile container
+      #     sudo /opt/linupdate/linupdate --env test
+      #     sudo /opt/linupdate/linupdate --mod-enable reposerver
+      #     sudo /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     sudo /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     sudo /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     sudo /opt/linupdate/linupdate --mod-configure reposerver --unregister
diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml
@@ -2,10 +2,7 @@ name: Build and test rpm package for linupdate
 
 on:
   push:
-    branches: [ devel ]
-  pull_request:
-    push:
-      branches: [ main ]
+    branches: [ linupdate-2.x.x ]
 
 jobs:
   # Build rpm package
@@ -23,6 +20,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -117,6 +116,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -158,18 +159,18 @@ jobs:
       - name: Install package
         run: yum --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}.noarch.rpm
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install packages on RockyLinux 8
   install-rockylinux8:
@@ -183,6 +184,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -199,18 +202,18 @@ jobs:
       - name: Install package
         run: yum --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}.noarch.rpm
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install packages on RockyLinux 9
   install-rockylinux9:
@@ -224,6 +227,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -240,18 +245,18 @@ jobs:
       - name: Install package
         run: yum --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}.noarch.rpm
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
 
   # Try to install packages on latest Fedora
   install-fedora:
@@ -265,6 +270,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'linupdate-2.x.x'
 
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
@@ -281,15 +288,15 @@ jobs:
       - name: Install package
         run: dnf --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}.noarch.rpm
 
-      - name: Test some params
-        run: |
-          /opt/linupdate/linupdate --help
-          /opt/linupdate/linupdate --version
-          /opt/linupdate/linupdate --check-updates
-          /opt/linupdate/linupdate --profile container
-          /opt/linupdate/linupdate --env test
-          /opt/linupdate/linupdate --mod-enable reposerver
-          /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
-          /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
-          /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
-          /opt/linupdate/linupdate --mod-configure reposerver --unregister
+      # - name: Test some params
+      #   run: |
+      #     /opt/linupdate/linupdate --help
+      #     /opt/linupdate/linupdate --version
+      #     /opt/linupdate/linupdate --check-updates
+      #     /opt/linupdate/linupdate --profile container
+      #     /opt/linupdate/linupdate --env test
+      #     /opt/linupdate/linupdate --mod-enable reposerver
+      #     /opt/linupdate/linupdate --mod-configure reposerver --url https://packages.bespin.ovh --fail-level 3
+      #     /opt/linupdate/linupdate --mod-configure reposerver --api-key ${{ secrets.REPOSITORY_TOKEN }} --register
+      #     /opt/linupdate/linupdate --mod-configure reposerver --send-full-status
+      #     /opt/linupdate/linupdate --mod-configure reposerver --unregister
diff --git a/mods-available/reposerver.mod b/mods-available/reposerver.mod
@@ -1056,15 +1056,16 @@ function send_general_status
 {
     UPDATE_MESSAGE_SUCCESS=""
     UPDATE_MESSAGE_ERROR=""
+    FQDN=$(hostname -f)
 
     # Check if reboot is needed
     checkRebootNeeded
 
     CURL_PARAMS=""
 
     # Paramètres généraux (os, version, profil...)
-    if [ ! -z "$HOSTNAME" ];then
-        CURL_PARAMS+="\"hostname\":\"$HOSTNAME\","
+    if [ ! -z "$FQDN" ];then
+        CURL_PARAMS+="\"hostname\":\"$FQDN\","
     fi
     if [ ! -z "$OS_NAME" ];then
         CURL_PARAMS+="\"os\":\"$OS_NAME\","

diff --git a/version b/version
@@ -1 +1 @@
-2.3.0
+2.3.1