Fix CKAN scripts

This commit is contained in:
Disassembler 2019-09-24 10:53:12 +02:00
parent 89d3dd7d0c
commit f9cc283477
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 9 additions and 9 deletions

View File

@ -16,28 +16,28 @@ cp postgres_data/pg_hba.conf /srv/ckan/postgres_data/pg_hba.conf
# Create database # Create database
export CKAN_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=') export CKAN_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
export CKAN_DS_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=') export CKAN_DS_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
lxc-start ckan_postgres #TODO: wait? service ckan_postgres start #TODO: wait?
envsubst <createdb.sql | lxc-attach -u 5432 -g 5432 ckan_postgres -- psql envsubst <createdb.sql | lxc-attach -u 5432 -g 5432 ckan_postgres -- psql
# Configure Redis # Configure Redis
mkdir -p /srv/ckan/redis_conf /srv/ckan/redis_data mkdir -p /srv/ckan/redis_conf /srv/ckan/redis_data
cp redis_conf/redis.conf /srv/ckan/redis_conf/redis.conf cp redis_conf/redis.conf /srv/ckan/redis_conf/redis.conf
chown -R 106379:106379 /srv/ckan/redis_data chown -R 106379:106379 /srv/ckan/redis_data
lxc-start ckan_redis service ckan_redis start
# Configure Solr # Configure Solr
mkdir -p /srv/ckan/solr_data mkdir -p /srv/ckan/solr_data
lxc-execute ckan_solr -- cat /opt/solr/server/solr/solr.xml >/srv/ckan/solr_data/solr.xml lxc-execute ckan_solr -- cat /opt/solr/server/solr/solr.xml >/srv/ckan/solr_data/solr.xml
chown -R 108983:108983 /srv/ckan/solr_data chown -R 108983:108983 /srv/ckan/solr_data
lxc-start ckan_solr # TODO: wait? service ckan_solr start # TODO: add ready / wait
# Configure CKAN Solr core # Configure CKAN Solr core
lxc-attach -u 8983 -g 8983 ckan_solr -- solr create -p 8983 -c ckan # TODO: wait to ensure creation? lxc-attach -u 8983 -g 8983 ckan_solr -- solr create -p 8983 -c ckan # TODO: wait to ensure creation?
lxc-stop ckan_solr service ckan_solr stop
cp solr_data/ckan/conf/schema.xml /srv/ckan/solr_data/ckan/conf/schema.xml cp solr_data/ckan/conf/schema.xml /srv/ckan/solr_data/ckan/conf/schema.xml
cp solr_data/ckan/conf/solrconfig.xml /srv/ckan/solr_data/ckan/conf/solrconfig.xml cp solr_data/ckan/conf/solrconfig.xml /srv/ckan/solr_data/ckan/conf/solrconfig.xml
chown 108983:108983 /srv/ckan/solr_data/ckan/conf/schema.xml # TODO: je to potreba? chown 108983:108983 /srv/ckan/solr_data/ckan/conf/schema.xml # TODO: je to potreba?
lxc-start ckan_solr # TODO: wait? service ckan_solr start
# Configure CKAN DataPusher # Configure CKAN DataPusher
mkdir -p /srv/ckan/datapusher_conf /srv/ckan/datapusher_data mkdir -p /srv/ckan/datapusher_conf /srv/ckan/datapusher_data
@ -71,9 +71,9 @@ envsubst <adminpwd.sql | lxc-attach -u 5432 -g 5432 ckan_postgres -- psql ckan
cp update-conf.sh /srv/ckan/update-conf.sh cp update-conf.sh /srv/ckan/update-conf.sh
# Stop services required for setup # Stop services required for setup
lxc-stop ckan_solr service ckan_solr stop
lxc-stop ckan_postgres service ckan_postgres stop
lxc-stop ckan_redis service ckan_redis stop
# Register application # Register application
vmmgr register-app ckan ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}" vmmgr register-app ckan ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}"

View File

@ -2,7 +2,7 @@
set -ev set -ev
# Remove persistent data # Remove persistent data
rm -f /srv/ckan rm -rf /srv/ckan
# Unregister application # Unregister application
vmmgr unregister-app ckan vmmgr unregister-app ckan