From 846a85e9394aa942d33cedd61a60e3a2c6972270 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 20 Sep 2019 10:12:18 +0200 Subject: [PATCH] Move CKAN app meta+files back to lxc-apps --- apps/ckan/meta | 52 ------------------- {apps => lxc-apps}/ckan/install.sh | 0 {apps => lxc-apps}/ckan/install/adminpwd.sql | 0 .../ckan/install/ckan_conf/ckan.ini | 0 .../ckan/install/ckan_conf/who.ini | 0 {apps => lxc-apps}/ckan/install/createdb.sql | 0 .../install/datapusher_conf/datapusher.wsgi | 0 .../datapusher_conf/datapusher_settings.py | 0 .../ckan/install/postgres_data/pg_hba.conf | 0 .../install/postgres_data/postgresql.conf | 0 .../ckan/install/redis_conf/redis.conf | 0 .../install/solr_data/ckan/conf/schema.xml | 0 .../solr_data/ckan/conf/solrconfig.xml | 0 .../ckan/install/solr_data/solr.xml | 0 .../ckan/install/update-conf.sh | 0 lxc-apps/ckan/meta | 52 +++++++++++++++++++ {apps => lxc-apps}/ckan/uninstall.sh | 0 17 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 apps/ckan/meta rename {apps => lxc-apps}/ckan/install.sh (100%) rename {apps => lxc-apps}/ckan/install/adminpwd.sql (100%) rename {apps => lxc-apps}/ckan/install/ckan_conf/ckan.ini (100%) rename {apps => lxc-apps}/ckan/install/ckan_conf/who.ini (100%) rename {apps => lxc-apps}/ckan/install/createdb.sql (100%) rename {apps => lxc-apps}/ckan/install/datapusher_conf/datapusher.wsgi (100%) rename {apps => lxc-apps}/ckan/install/datapusher_conf/datapusher_settings.py (100%) rename {apps => lxc-apps}/ckan/install/postgres_data/pg_hba.conf (100%) rename {apps => lxc-apps}/ckan/install/postgres_data/postgresql.conf (100%) rename {apps => lxc-apps}/ckan/install/redis_conf/redis.conf (100%) rename {apps => lxc-apps}/ckan/install/solr_data/ckan/conf/schema.xml (100%) rename {apps => lxc-apps}/ckan/install/solr_data/ckan/conf/solrconfig.xml (100%) rename {apps => lxc-apps}/ckan/install/solr_data/solr.xml (100%) rename {apps => lxc-apps}/ckan/install/update-conf.sh (100%) create mode 100644 lxc-apps/ckan/meta rename {apps => lxc-apps}/ckan/uninstall.sh (100%) diff --git a/apps/ckan/meta b/apps/ckan/meta deleted file mode 100644 index 183d77c..0000000 --- a/apps/ckan/meta +++ /dev/null @@ -1,52 +0,0 @@ -{ - 'version': '1234', - 'meta': { - 'title': 'CKAN', - 'desc-cs': 'Datový sklad', - 'desc-en': 'Data store', - 'license': 'GPL' - }, - 'containers': { - 'ckan': { - 'image': 'ckan_123', - 'depends': [ - 'ckan_datapusher', - 'ckan_redis', - 'ckan_solr', - 'ckan_postgres' - ], - 'mounts': { - '/srv/ckan/ckan_conf': '/etc/ckan', - '/srv/ckan/ckan_data': '/srv/ckan/storage' - } - }, - 'ckan_datapusher': { - 'image': 'ckan-datapusher_123', - 'mounts': { - '/etc/ssl/services.pem': '/etc/ssl/services.pem', - '/srv/ckan/datapusher_conf': '/etc/ckan-datapusher', - '/srv/ckan/datapusher_data': '/srv/ckan-datapusher/data' - } - }, - 'ckan_redis': { - 'image': 'redis_123', - 'mounts': { - '/srv/ckan/redis_conf/redis.conf': '/etc/redis.conf' - '/srv/ckan/redis_data': '/var/lib/redis' - } - }, - 'ckan_solr': { - 'image': 'solr_123', - 'mounts': { - '/srv/ckan/solr_data': '/var/lib/solr' - } - }, - 'ckan_postgres': { - 'image': 'postgis_123', - 'mounts': { - '/srv/ckan/postgres_data': '/var/lib/postgresql' - } - } - }, - 'proxy': 'ckan' -} diff --git a/apps/ckan/install.sh b/lxc-apps/ckan/install.sh similarity index 100% rename from apps/ckan/install.sh rename to lxc-apps/ckan/install.sh diff --git a/apps/ckan/install/adminpwd.sql b/lxc-apps/ckan/install/adminpwd.sql similarity index 100% rename from apps/ckan/install/adminpwd.sql rename to lxc-apps/ckan/install/adminpwd.sql diff --git a/apps/ckan/install/ckan_conf/ckan.ini b/lxc-apps/ckan/install/ckan_conf/ckan.ini similarity index 100% rename from apps/ckan/install/ckan_conf/ckan.ini rename to lxc-apps/ckan/install/ckan_conf/ckan.ini diff --git a/apps/ckan/install/ckan_conf/who.ini b/lxc-apps/ckan/install/ckan_conf/who.ini similarity index 100% rename from apps/ckan/install/ckan_conf/who.ini rename to lxc-apps/ckan/install/ckan_conf/who.ini diff --git a/apps/ckan/install/createdb.sql b/lxc-apps/ckan/install/createdb.sql similarity index 100% rename from apps/ckan/install/createdb.sql rename to lxc-apps/ckan/install/createdb.sql diff --git a/apps/ckan/install/datapusher_conf/datapusher.wsgi b/lxc-apps/ckan/install/datapusher_conf/datapusher.wsgi similarity index 100% rename from apps/ckan/install/datapusher_conf/datapusher.wsgi rename to lxc-apps/ckan/install/datapusher_conf/datapusher.wsgi diff --git a/apps/ckan/install/datapusher_conf/datapusher_settings.py b/lxc-apps/ckan/install/datapusher_conf/datapusher_settings.py similarity index 100% rename from apps/ckan/install/datapusher_conf/datapusher_settings.py rename to lxc-apps/ckan/install/datapusher_conf/datapusher_settings.py diff --git a/apps/ckan/install/postgres_data/pg_hba.conf b/lxc-apps/ckan/install/postgres_data/pg_hba.conf similarity index 100% rename from apps/ckan/install/postgres_data/pg_hba.conf rename to lxc-apps/ckan/install/postgres_data/pg_hba.conf diff --git a/apps/ckan/install/postgres_data/postgresql.conf b/lxc-apps/ckan/install/postgres_data/postgresql.conf similarity index 100% rename from apps/ckan/install/postgres_data/postgresql.conf rename to lxc-apps/ckan/install/postgres_data/postgresql.conf diff --git a/apps/ckan/install/redis_conf/redis.conf b/lxc-apps/ckan/install/redis_conf/redis.conf similarity index 100% rename from apps/ckan/install/redis_conf/redis.conf rename to lxc-apps/ckan/install/redis_conf/redis.conf diff --git a/apps/ckan/install/solr_data/ckan/conf/schema.xml b/lxc-apps/ckan/install/solr_data/ckan/conf/schema.xml similarity index 100% rename from apps/ckan/install/solr_data/ckan/conf/schema.xml rename to lxc-apps/ckan/install/solr_data/ckan/conf/schema.xml diff --git a/apps/ckan/install/solr_data/ckan/conf/solrconfig.xml b/lxc-apps/ckan/install/solr_data/ckan/conf/solrconfig.xml similarity index 100% rename from apps/ckan/install/solr_data/ckan/conf/solrconfig.xml rename to lxc-apps/ckan/install/solr_data/ckan/conf/solrconfig.xml diff --git a/apps/ckan/install/solr_data/solr.xml b/lxc-apps/ckan/install/solr_data/solr.xml similarity index 100% rename from apps/ckan/install/solr_data/solr.xml rename to lxc-apps/ckan/install/solr_data/solr.xml diff --git a/apps/ckan/install/update-conf.sh b/lxc-apps/ckan/install/update-conf.sh similarity index 100% rename from apps/ckan/install/update-conf.sh rename to lxc-apps/ckan/install/update-conf.sh diff --git a/lxc-apps/ckan/meta b/lxc-apps/ckan/meta new file mode 100644 index 0000000..3ebf075 --- /dev/null +++ b/lxc-apps/ckan/meta @@ -0,0 +1,52 @@ +{ + "version": "2.8.2-190620", + "meta": { + "title": "CKAN", + "desc-cs": "Datový sklad", + "desc-en": "Data store", + "license": "GPL", + "proxy": "ckan" + }, + "containers": { + "ckan": { + "image": "ckan_2.8.2-190620", + "depends": [ + "ckan_datapusher", + "ckan_redis", + "ckan_solr", + "ckan_postgres" + ], + "mounts": [ + ["DIR", "/srv/ckan/ckan_conf", "/etc/ckan"], + ["DIR", "/srv/ckan/ckan_data", "/srv/ckan/storage"] + ] + }, + "ckan_datapusher": { + "image": "ckan-datapusher_0.0.13-190620", + "mounts": [ + ["FILE", "/etc/ssl/services.pem", "/etc/ssl/services.pem"], + ["DIR", "/srv/ckan/datapusher_conf", "/etc/ckan-datapusher"], + ["DIR", "/srv/ckan/datapusher_data", "/srv/ckan-datapusher/data"] + ] + }, + "ckan_redis": { + "image": "redis_4.0.12-190620", + "mounts": [ + ["FILE", "/srv/ckan/redis_conf/redis.conf", "/etc/redis.conf"], + ["DIR", "/srv/ckan/redis_data", "/var/lib/redis"] + ] + }, + "ckan_solr": { + "image": "solr6_6.5.1-190620", + "mounts": [ + ["DIR", "/srv/ckan/solr_data", "/var/lib/solr"] + ] + }, + "ckan_postgres": { + "image": "postgis_11.3.0-190620", + "mounts": [ + ["DIR", "/srv/ckan/postgres_data", "/var/lib/postgresql"] + ] + } + } +} diff --git a/apps/ckan/uninstall.sh b/lxc-apps/ckan/uninstall.sh similarity index 100% rename from apps/ckan/uninstall.sh rename to lxc-apps/ckan/uninstall.sh