Handle different users in the 2.9 and 2.10 prerun scripts

ckan-sys only exists in the Python based images (Dockerfile.py*) after #80
ckan · Nov 15, 2024 · 612d0b9 · 612d0b9
1 parent b4ee7b0
commit 612d0b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/ckan-2.10/setup/prerun.py b/ckan-2.10/setup/prerun.py
@@ -1,4 +1,5 @@
 import os
+import pwd
 import sys
 import subprocess
 import psycopg2
@@ -200,9 +201,16 @@ def create_sysadmin():
         # We're running as root before pivoting to uwsgi and dropping privs
         data_dir = "%s/storage" % os.environ['CKAN_STORAGE_PATH']
 
-        command = ["chown", "-R", "ckan:ckan-sys", data_dir]
+        try:
+            user_name = "ckan-sys"
+            pwd.getpwnam(user_name)
+            command = ["chown", "-R", "ckan:ckan-sys", data_dir]
+        except KeyError:
+            user_name = "ckan"
+            command = ["chown", "-R", "ckan:ckan", data_dir]
         subprocess.call(command)
-        print("[prerun] Ensured storage directory is owned by ckan")
+
+        print("[prerun] Ensured storage directory is owned by {}".format(user_name))
 
 if __name__ == "__main__":
 

diff --git a/ckan-2.9/setup/prerun.py b/ckan-2.9/setup/prerun.py
@@ -1,4 +1,5 @@
 import os
+import pwd
 import sys
 import subprocess
 import psycopg2
@@ -200,9 +201,16 @@ def create_sysadmin():
         # We're running as root before pivoting to uwsgi and dropping privs
         data_dir = "%s/storage" % os.environ['CKAN_STORAGE_PATH']
 
-        command = ["chown", "-R", "ckan:ckan", data_dir]
+        try:
+            user_name = "ckan-sys"
+            pwd.getpwnam(user_name)
+            command = ["chown", "-R", "ckan:ckan-sys", data_dir]
+        except KeyError:
+            user_name = "ckan"
+            command = ["chown", "-R", "ckan:ckan", data_dir]
         subprocess.call(command)
-        print("[prerun] Ensured storage directory is owned by ckan")
+
+        print("[prerun] Ensured storage directory is owned by {}".format(user_name))
 
 if __name__ == "__main__":