Merge pull request #26 from atlas-bi/dev

Dev
atlas-bi · Nov 26, 2021 · 0b98e75 · 0b98e75
2 parents 444e5ac + 80cc6da
commit 0b98e75
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 19 deletions.
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -5,6 +5,8 @@ name: cancel
 
 on:
   push:
+    branches:
+    - '!master'
 
 jobs:
   cancel:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,6 +2,8 @@ name: codeQL
 
 on:
   push:
+    branches:
+    - '!master'
   pull_request:
   schedule:
   - cron: 16 7 * * 4

diff --git a/packages/atlas-hub-<version>/atlas-hub b/packages/atlas-hub-<version>/atlas-hub
@@ -41,6 +41,7 @@ INSTALL_DIR="$BASE_DIR/app"
 USER_DIR="/etc/atlas-hub"
 BACKUP_DIR="$USER_DIR/backup"
 LOG_DIR="/var/log/atlas-hub"
+EXTERNAL_URL=${EXTERNAL_URL:-$HOSTNAME}
 
 HIST_DATE=$(date +"%s_%Y_%m_%d")
 
@@ -85,6 +86,9 @@ configure(){
     python3 -c "from installers import build_secrets; build_secrets()"
 
     fmt_yellow "Updating configuration"
+
+    install_configuration
+
     python3 -c "from installers import build_web_configuration; build_web_configuration(\"$INSTALL_DIR\", \"/etc/atlas-hub/config.ini\")"
 
     fmt_yellow "Configuring Nginx"

diff --git a/packages/atlas-hub-<version>/config.ini b/packages/atlas-hub-<version>/config.ini
@@ -1,6 +1,6 @@
 [MASTER]
 ; web address used to access the site
-HOST='localhost'
+EXTERNAL_URL='localhost'
 
 ; min requirements to keep tasks running
 ; MIN_DISK_SPACE=1 * 1024 * 1024 * 1024

diff --git a/packages/atlas-hub-<version>/debian/postinst b/packages/atlas-hub-<version>/debian/postinst
@@ -2,6 +2,7 @@
 python3 -m pip install colorama tqdm requests -q --no-warn-script-location
 
 VERSION=<version>
+EXTERNAL_URL=${EXTERNAL_URL:-$HOSTNAME}
 
 BASE_DIR="/usr/lib/atlas-hub"
 INSTALL_DIR="$BASE_DIR/app"
@@ -18,18 +19,7 @@ cd "$BASE_DIR"
 # create pass file
 python3 -c "from installers import build_secrets; build_secrets()"
 
-
-
-# install default configuration if missing
-if [ ! -e "$USER_DIR/config.ini" ]
-then
-  if [ ! -d "$USER_DIR" ]; then
-    mkdir -p "$USER_DIR"
-  fi
-  mv $BASE_DIR/config.ini /etc/atlas-hub/config.ini
-else
-  rm $BASE_DIR/config.ini
-fi
+install_configuration
 
 # download app
 python3 -c "from installers import download; download(\"https://github.com/atlas-bi/atlas-automation-hub/archive/refs/tags/$VERSION.tar.gz\", \"Atlas Hub $VERSION\", \"app.tar.gz\")" 

diff --git a/packages/atlas-hub-<version>/functions.sh b/packages/atlas-hub-<version>/functions.sh
@@ -48,6 +48,19 @@ name() {
 
 }
 
+install_configuration(){
+  # install default configuration if missing
+  if [ ! -e "$USER_DIR/config.ini" ]
+  then
+    if [ ! -d "$USER_DIR" ]; then
+      mkdir -p "$USER_DIR"
+    fi
+    # apply initial external url
+    sed -i -e "s/EXTERNAL_URL='localhost'/EXTERNAL_URL='${EXTERNAL_URL}'/g" "$BASE_DIR/config.ini" > /dev/null
+    cp "$BASE_DIR/config.ini" /etc/atlas-hub/config.ini
+  fi
+}
+
 stop_services(){
   BASE_DIR="/usr/lib/atlas-hub"
   INSTALL_DIR="$BASE_DIR/app"

diff --git a/packages/atlas-hub-<version>/installers.py b/packages/atlas-hub-<version>/installers.py
@@ -50,8 +50,11 @@ def build_web_configuration(install_dir: str, config_ini: str) -> None:
     configuration = configparser.ConfigParser()
     configuration.read(config_ini)
 
-    if configuration.has_section("MASTER") and "HOST" in configuration["MASTER"]:
-        hostname = configuration["MASTER"]["HOST"]
+    if (
+        configuration.has_section("MASTER")
+        and "EXTERNAL_URL" in configuration["MASTER"]
+    ):
+        hostname = configuration["MASTER"]["EXTERNAL_URL"]
     else:
         hostname = socket.gethostname()
 
@@ -274,8 +277,9 @@ def build_nginx_configuration(config_ini: str) -> None:
     atlas_config.read(config_ini)
 
     hostname = (
-        atlas_config["MASTER"]["HOST"]
-        if atlas_config.has_section("MASTER") and "HOST" in atlas_config["MASTER"]
+        atlas_config["MASTER"]["EXTERNAL_URL"]
+        if atlas_config.has_section("MASTER")
+        and "EXTERNAL_URL" in atlas_config["MASTER"]
         else socket.gethostname()
     )
 

diff --git a/packages/atlas-hub-<version>/readme.md b/packages/atlas-hub-<version>/readme.md
@@ -29,9 +29,8 @@ cp -r "atlas-hub-<version>" "atlas-hub-$VERSION" \
 && find . -type f -name "*" -exec sed -i'' -e "s/<version>/$VERSION/g" {} + \
 && debuild --no-tgz-check -us -uc \
 && cd .. \
+&& EXPORT EXTERNAL_URL="$HOSTNAME"; apt-get install ./atlas-hub_*.deb -y
 && apt-get install ./atlas-hub_*.deb -y
-
-
 ```
 
 ## To install a build
@@ -41,6 +40,10 @@ curl -s --compressed "https://atlas-bi.github.io/ppa/deb/KEY.gpg" | sudo apt-key
 sudo curl -s --compressed -o /etc/apt/sources.list.d/atlas.list "https://atlas-bi.github.io/ppa/deb/atlas.list"
 sudo apt update
 sudo apt install atlas-hub
+
+# or to specify the external url directory
+EXPORT EXTERNAL_URL='https://google.com'; sudo apt install atlas-hub
+
 ```
 
 ## Where the files should end up
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ name: cancel @@
     on:
       push:
+        branches:
+        - '!master'
     jobs:
       cancel:
@@ Expand Down @@