fix

SteveKueng · Jun 26, 2024 · be05e55 · be05e55
1 parent c60a67e
commit be05e55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/main_mwa2test.yml b/.github/workflows/main_mwa2test.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Install dependencies
         run: pip install -r requirements_azure.txt
 
-      - name: list
-        run: pwd; ls -al
+      - name: create munkitools directory
+        run: mkdir -p munkitools
 
       - name: Install munkitools
         run: curl -Lk -o /tmp/munkitools.zip `curl --silent https://api.github.com/repos/munki/munki/releases/latest | /usr/bin/awk '/zipball_url/ { print $2 }' | sed 's/[",]//g'` && unzip /tmp/munkitools.zip -d /tmp/munkitools && rm -rf /tmp/munkitools.zip && cp -R /tmp/munkitools/munki-munki-*/code/client munkitools && rm -rf /tmp/munkitools

diff --git a/munkiwebadmin/settings.py b/munkiwebadmin/settings.py
@@ -24,6 +24,10 @@
 
 # Munki repo settings
 MUNKI_REPO_URL = os.getenv('MUNKI_REPO_URL', 'file:///munkirepo')
+if MUNKI_REPO_URL.startswith('file://'):
+    if not os.path.exists(MUNKI_REPO_URL[7:]):
+        MUNKI_REPO_URL = os.path.join(BASE_DIR, 'munkirepo')
+
 MUNKI_REPO_PLUGIN = os.getenv('MUNKI_REPO_PLUGIN', 'FileRepo')
 MUNKITOOLS_DIR = os.getenv('MUNKITOOLS_DIR', '/munkitools')
 if not os.path.exists(MUNKITOOLS_DIR):