Merge pull request #125 from okfn/api_token_expire_for_ckan_10_dev

Api token expire for ckan 10 dev
okfn · Aug 15, 2023 · 0b59fef · 0b59fef
2 parents 3eb5a72 + 18ffa2a
commit 0b59fef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ckan-base/2.10/setup/start_ckan.sh b/ckan-base/2.10/setup/start_ckan.sh
@@ -32,7 +32,6 @@ else
     TOKEN_EXTRAS=""
 fi
 
-expires_in=30 unit=4
 echo "Set up ckan.datapusher.api_token"
 ckan config-tool $CKAN_INI "ckan.datapusher.api_token=$(ckan -c $CKAN_INI user token add ckan_admin datapusher $TOKEN_EXTRAS | tail -n 1 | tr -d '\t')"
 

diff --git a/ckan-dev/2.10/setup/start_ckan_development.sh b/ckan-dev/2.10/setup/start_ckan_development.sh
@@ -78,7 +78,7 @@ sudo -u ckan -EH python3 prerun.py
 
 # Set a proper value for ckan.datapusher.api_token now that that an admin user exists
 echo "Set up ckan.datapusher.api_token"
-ckan config-tool $CKAN_INI "ckan.datapusher.api_token=$(ckan -c $CKAN_INI user token add ckan_admin datapusher | tail -n 1 | tr -d '\t')"
+ckan config-tool $CKAN_INI "ckan.datapusher.api_token=$(ckan -c $CKAN_INI user token add ckan_admin datapusher expires_in=365 unit=4 | tail -n 1 | tr -d '\t')"
 
 # Run any startup scripts provided by images extending this one
 if [[ -d "/docker-entrypoint.d" ]]