ci: update master save path

Aetherinox · Oct 27, 2024 · 8874cec · 8874cec
1 parent 8df58b9
commit 8874cec
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/.github/scripts/bl-block.sh b/.github/scripts/bl-block.sh
@@ -64,7 +64,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_PERM="${ARG_SAVEFILE}"                         # perm file when building ipset list
@@ -114,6 +114,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM} (${ARG_BLOCKS_CAT})"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-format.sh b/.github/scripts/bl-format.sh
@@ -53,7 +53,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_TEMP="${ARG_SAVEFILE}.tmp"                     # temp file when building ipset list
@@ -152,6 +152,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-html.sh b/.github/scripts/bl-html.sh
@@ -72,7 +72,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_PERM="${ARG_SAVEFILE}"                         # perm file when building ipset list
@@ -120,6 +120,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-htmlip.sh b/.github/scripts/bl-htmlip.sh
@@ -73,7 +73,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # results of curl command
 APP_FILE_TEMP="${ARG_SAVEFILE}.tmp"                     # temp file when building ipset list
@@ -124,6 +124,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-json.sh b/.github/scripts/bl-json.sh
@@ -74,7 +74,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_TEMP="${ARG_SAVEFILE}.tmp"                     # temp file when building ipset list
@@ -125,6 +125,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-master.sh b/.github/scripts/bl-master.sh
@@ -69,7 +69,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_PERM="${ARG_SAVEFILE}"                         # perm file when building ipset list
@@ -119,6 +119,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-plain.sh b/.github/scripts/bl-plain.sh
@@ -63,7 +63,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_FILE_PERM="${ARG_SAVEFILE}"                         # perm file when building ipset list
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
@@ -111,6 +111,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/scripts/bl-spf.sh b/.github/scripts/bl-spf.sh
@@ -51,7 +51,7 @@ fi
 
 SECONDS=0                                               # set seconds count for beginning of script
 APP_DIR=${PWD}                                          # returns the folder this script is being executed in
-APP_REPO="Aetherinox/csf-firewall"                            # repository
+APP_REPO="Aetherinox/dev-kw"                            # repository
 APP_REPO_BRANCH="main"                                  # repository branch
 APP_OUT=""                                              # each ip fetched from stdin will be stored in this var
 APP_FILE_TEMP="${ARG_SAVEFILE}.tmp"                     # temp file when building ipset list
@@ -234,6 +234,7 @@ echo -e "  Blocklist -  ${APP_FILE_PERM}"
 echo -e "  ID:          ${TEMPL_ID}"
 echo -e "  UUID:        ${TEMPL_UUID}"
 echo -e "  CATEGORY:    ${TEMPL_CAT}"
+echo -e "  ACTION:      ${APP_FILE}"
 echo -e " ──────────────────────────────────────────────────────────────────────────────────────────────"
 
 # #

diff --git a/.github/workflows/blocklist-generate.yml b/.github/workflows/blocklist-generate.yml
@@ -161,7 +161,7 @@ jobs:
             - name: "🧱 Generate › Master"
               id: task_blocklist_generate_master
               run: |
-                  run_master=".github/scripts/bl-master.sh ${{ vars.API_01_OUT }} ${{ secrets.API_01_FILE_01 }} ${{ secrets.API_01_FILE_02 }} ${{ secrets.API_01_FILE_03 }} ${{ secrets.API_01_FILE_04 }} ${{ secrets.API_01_FILE_05 }} ${{ secrets.API_01_FILE_06 }} ${{ secrets.API_01_FILE_07 }} ${{ secrets.API_01_FILE_08 }}"
+                  run_master=".github/scripts/bl-master.sh blocklists/${{ vars.API_01_OUT }} ${{ secrets.API_01_FILE_01 }} ${{ secrets.API_01_FILE_02 }} ${{ secrets.API_01_FILE_03 }} ${{ secrets.API_01_FILE_04 }} ${{ secrets.API_01_FILE_05 }} ${{ secrets.API_01_FILE_06 }} ${{ secrets.API_01_FILE_07 }} ${{ secrets.API_01_FILE_08 }}"
                   eval "./$run_master"
 
                   run_highrisk=".github/scripts/bl-htmlip.sh blocklists/${{ vars.API_01_HIGHRISK_OUT }} ${{ secrets.API_01_HIGHRISK_URL }} '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}'"