Skip to content

Commit

Permalink
Merge pull request #4 from dbca-wa/feature/BIO-6387-6392
Browse files Browse the repository at this point in the history
[BIO-6387] enabled dbca extension, configured config and add cronjob
  • Loading branch information
MarkCalvert authored Dec 20, 2023
2 parents 0b01ba3 + 0aa6ee6 commit fcbea47
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .env.dbca
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CKAN_SMTP_STARTTLS=True
CKAN_SMTP_USER=user
CKAN_SMTP_PASSWORD=pass
CKAN_SMTP_MAIL_FROM=ckan@localhost
TZ=UTC
TZ=Australia/Perth

# Solr
SOLR_IMAGE_VERSION=2.10-solr9
Expand All @@ -74,7 +74,6 @@ NGINX_SSLPORT=443

# Extensions


## WA DBCA Config ##
# Docker compose project name
COMPOSE_PROJECT_NAME=dbca
Expand Down
9 changes: 7 additions & 2 deletions ckan/config/dbca.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,22 @@ use = config:/srv/app/ckan.ini
ckan.devserver.watch_patterns = /srv/app/ckan.ini

## Plugins Settings ############################################################
ckan.plugins = image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat envvars
ckan.plugins = image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat dbca scheming_datasets envvars

## Resource Views Settings #####################################################
ckan.views.default_views = text_view datatables_view pdf_view

## Internationalisation Settings ###############################################
ckan.locale_default = en_AU
ckan.display_timezone = Australia/West
ckan.display_timezone = Australia/Perth
ckan.resource_formats = /srv/app/src_extensions/ckanext-dbca/ckanext/dbca/config/resource_formats.json

## CKAN Extensions configuration ###############################################

# ckanext-scheming
scheming.dataset_schemas = ckanext.dbca:dbca_dataset.yaml

## CKAN Extensions configuration ###############################################

## Logging configuration
[loggers]
Expand Down
3 changes: 2 additions & 1 deletion ckan/setup/dbca_ckan_cron_jobs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Crontab for CKAN cron jobs
# Example cron job runs the harvester run command every 15 mins
#*/15 * * * * /usr/bin/ckan -c /srv/app/ckan.ini harvester run >> $APP_DIR/logs/ckan-cron-jobs.log 2>&1
#*/15 * * * * /usr/bin/ckan -c /srv/app/config/dbca/ckan.ini harvester run >> $APP_DIR/logs/ckan-cron-jobs.log 2>&1
0 0 * * * /usr/bin/ckan -c /srv/app/config/dbca/ckan.ini dbca scheduled_datasets >> $APP_DIR/logs/ckan-cron-jobs.log 2>&1
2 changes: 1 addition & 1 deletion ckan/supervisor/ckan_worker_default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[program:ckan-worker-default]

; Use the full paths to the virtualenv and your configuration file here.
command=/usr/bin/ckan -c /srv/app/ckan.ini jobs worker
command=/usr/bin/ckan -c /srv/app/config/dbca.ini jobs worker


; User the worker runs as.
Expand Down
2 changes: 2 additions & 0 deletions src/dbca_install_extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
cd src/

## Must Have ##
git clone https://github.com/dbca-wa/ckanext-dbca.git

# QA
# git clone https://github.com/dbca-wa/ckanext-qa.git
# These extensions will be installed by default, but we don't want them
Expand Down

0 comments on commit fcbea47

Please sign in to comment.