diff --git a/.env.dbca b/.env.dbca index bb4fbf0d..19df1b54 100644 --- a/.env.dbca +++ b/.env.dbca @@ -37,7 +37,10 @@ USE_HTTPS_FOR_DEV=false # CKAN core CKAN_VERSION=2.10.0 CKAN_SITE_ID=default -CKAN_SITE_URL=http://localhost:5000 +# CKAN Dev +CKAN_SITE_URL=http://localhost:$CKAN_PORT_HOST +# CKAN Nginx +#CKAN_SITE_URL=https://localhost:$NGINX_SSLPORT_HOST CKAN_PORT=5000 CKAN___BEAKER__SESSION__SECRET=CHANGE_ME diff --git a/ckan/config/dbca.ini b/ckan/config/dbca.ini index 4a3fd3d3..cd0022f0 100644 --- a/ckan/config/dbca.ini +++ b/ckan/config/dbca.ini @@ -10,10 +10,10 @@ use = config:/srv/app/ckan.ini ckan.devserver.watch_patterns = /srv/app/ckan.ini ## Plugins Settings ############################################################ -ckan.plugins = dbca image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat scheming_datasets spatial_metadata spatial_query doi qa archiver report resource_proxy geo_view shp_view envvars +ckan.plugins = dbca image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat scheming_datasets spatial_metadata spatial_query doi qa archiver report resource_proxy geo_view shp_view officedocs_view envvars ## Resource Views Settings ##################################################### -ckan.views.default_views = text_view datatables_view pdf_view geo_view shp_view +ckan.views.default_views = text_view datatables_view pdf_view geo_view shp_view officedocs_view ## Internationalisation Settings ############################################### ckan.locale_default = en_AU diff --git a/ckan/setup/dbca_requirements.sh b/ckan/setup/dbca_requirements.sh index eb0d7e81..b5847a69 100644 --- a/ckan/setup/dbca_requirements.sh +++ b/ckan/setup/dbca_requirements.sh @@ -72,3 +72,6 @@ rm /tmp/qsv.zip apk add file pip3 install -e git+https://github.com/dbca-wa/ckanext-qa.git@develop#egg=ckanext-qa pip3 install -r ${SRC_DIR}/ckanext-qa/requirements.txt + +# Office Docs +pip3 install -e git+https://github.com/dbca-wa/ckanext-officedocs.git@develop#egg=ckanext-officedocs \ No newline at end of file diff --git a/src/dbca_install_extensions.sh b/src/dbca_install_extensions.sh index a4db0509..1d21f24e 100644 --- a/src/dbca_install_extensions.sh +++ b/src/dbca_install_extensions.sh @@ -12,6 +12,6 @@ git clone https://github.com/dbca-wa/ckanext-qa.git #These extensions will be installed by default, but we don't want them sed -i".$(date +%Y%m%d_%H%M%S).bak" -e '/ckanext-report/d' -e '/ckanext-archiver/d' ckanext-qa/dev-requirements.txt # Office Docs -# git clone https://github.com/dbca-wa/ckanext-officedocs +git clone https://github.com/dbca-wa/ckanext-officedocs.git echo "Ready to build project: ahoy build"