diff --git a/activemq/setup.sh b/activemq/install.sh similarity index 100% rename from activemq/setup.sh rename to activemq/install.sh diff --git a/activemq/setup/etc/init.d/activemq b/activemq/install/etc/init.d/activemq similarity index 100% rename from activemq/setup/etc/init.d/activemq rename to activemq/install/etc/init.d/activemq diff --git a/ckan-datapusher/setup.sh b/ckan-datapusher/install.sh similarity index 100% rename from ckan-datapusher/setup.sh rename to ckan-datapusher/install.sh diff --git a/ckan-datapusher/setup/etc/init.d/ckan-datapusher b/ckan-datapusher/install/etc/init.d/ckan-datapusher similarity index 100% rename from ckan-datapusher/setup/etc/init.d/ckan-datapusher rename to ckan-datapusher/install/etc/init.d/ckan-datapusher diff --git a/ckan-datapusher/setup/srv/ckan-datapusher/conf/datapusher.wsgi b/ckan-datapusher/install/srv/ckan-datapusher/conf/datapusher.wsgi similarity index 100% rename from ckan-datapusher/setup/srv/ckan-datapusher/conf/datapusher.wsgi rename to ckan-datapusher/install/srv/ckan-datapusher/conf/datapusher.wsgi diff --git a/ckan-datapusher/setup/srv/ckan-datapusher/conf/datapusher_settings.py b/ckan-datapusher/install/srv/ckan-datapusher/conf/datapusher_settings.py similarity index 100% rename from ckan-datapusher/setup/srv/ckan-datapusher/conf/datapusher_settings.py rename to ckan-datapusher/install/srv/ckan-datapusher/conf/datapusher_settings.py diff --git a/ckan-datapusher/setup/srv/ckan-datapusher/update-conf.sh b/ckan-datapusher/install/srv/ckan-datapusher/update-conf.sh similarity index 100% rename from ckan-datapusher/setup/srv/ckan-datapusher/update-conf.sh rename to ckan-datapusher/install/srv/ckan-datapusher/update-conf.sh diff --git a/ckan/setup.sh b/ckan/install.sh similarity index 100% rename from ckan/setup.sh rename to ckan/install.sh diff --git a/ckan/setup/adminpwd.sql b/ckan/install/adminpwd.sql similarity index 100% rename from ckan/setup/adminpwd.sql rename to ckan/install/adminpwd.sql diff --git a/ckan/setup/createdb.sql b/ckan/install/createdb.sql similarity index 100% rename from ckan/setup/createdb.sql rename to ckan/install/createdb.sql diff --git a/ckan/setup/etc/init.d/ckan b/ckan/install/etc/init.d/ckan similarity index 100% rename from ckan/setup/etc/init.d/ckan rename to ckan/install/etc/init.d/ckan diff --git a/ckan/setup/etc/periodic/hourly/ckan b/ckan/install/etc/periodic/hourly/ckan similarity index 100% rename from ckan/setup/etc/periodic/hourly/ckan rename to ckan/install/etc/periodic/hourly/ckan diff --git a/ckan/setup/srv/ckan/conf/ckan.ini b/ckan/install/srv/ckan/conf/ckan.ini similarity index 100% rename from ckan/setup/srv/ckan/conf/ckan.ini rename to ckan/install/srv/ckan/conf/ckan.ini diff --git a/ckan/setup/srv/ckan/conf/who.ini b/ckan/install/srv/ckan/conf/who.ini similarity index 100% rename from ckan/setup/srv/ckan/conf/who.ini rename to ckan/install/srv/ckan/conf/who.ini diff --git a/ckan/setup/srv/ckan/update-conf.sh b/ckan/install/srv/ckan/update-conf.sh similarity index 100% rename from ckan/setup/srv/ckan/update-conf.sh rename to ckan/install/srv/ckan/update-conf.sh diff --git a/ckan/setup/srv/solr/data/ckan/conf/schema.xml b/ckan/install/srv/solr/data/ckan/conf/schema.xml similarity index 100% rename from ckan/setup/srv/solr/data/ckan/conf/schema.xml rename to ckan/install/srv/solr/data/ckan/conf/schema.xml diff --git a/ckan/setup/srv/solr/data/ckan/conf/solrconfig.xml b/ckan/install/srv/solr/data/ckan/conf/solrconfig.xml similarity index 100% rename from ckan/setup/srv/solr/data/ckan/conf/solrconfig.xml rename to ckan/install/srv/solr/data/ckan/conf/solrconfig.xml diff --git a/crisiscleanup/setup.sh b/crisiscleanup/install.sh similarity index 100% rename from crisiscleanup/setup.sh rename to crisiscleanup/install.sh diff --git a/crisiscleanup/setup/createdb.sql b/crisiscleanup/install/createdb.sql similarity index 100% rename from crisiscleanup/setup/createdb.sql rename to crisiscleanup/install/createdb.sql diff --git a/crisiscleanup/setup/etc/init.d/crisiscleanup b/crisiscleanup/install/etc/init.d/crisiscleanup similarity index 100% rename from crisiscleanup/setup/etc/init.d/crisiscleanup rename to crisiscleanup/install/etc/init.d/crisiscleanup diff --git a/crisiscleanup/setup/srv/crisiscleanup/conf/boot.rb b/crisiscleanup/install/srv/crisiscleanup/conf/boot.rb similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/conf/boot.rb rename to crisiscleanup/install/srv/crisiscleanup/conf/boot.rb diff --git a/crisiscleanup/setup/srv/crisiscleanup/conf/database.yml b/crisiscleanup/install/srv/crisiscleanup/conf/database.yml similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/conf/database.yml rename to crisiscleanup/install/srv/crisiscleanup/conf/database.yml diff --git a/crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb b/crisiscleanup/install/srv/crisiscleanup/conf/environments/production.rb similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb rename to crisiscleanup/install/srv/crisiscleanup/conf/environments/production.rb diff --git a/crisiscleanup/setup/srv/crisiscleanup/conf/initializers/devise.rb b/crisiscleanup/install/srv/crisiscleanup/conf/initializers/devise.rb similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/conf/initializers/devise.rb rename to crisiscleanup/install/srv/crisiscleanup/conf/initializers/devise.rb diff --git a/crisiscleanup/setup/srv/crisiscleanup/db/seeds.rb b/crisiscleanup/install/srv/crisiscleanup/db/seeds.rb similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/db/seeds.rb rename to crisiscleanup/install/srv/crisiscleanup/db/seeds.rb diff --git a/crisiscleanup/setup/srv/crisiscleanup/update-conf.sh b/crisiscleanup/install/srv/crisiscleanup/update-conf.sh similarity index 100% rename from crisiscleanup/setup/srv/crisiscleanup/update-conf.sh rename to crisiscleanup/install/srv/crisiscleanup/update-conf.sh diff --git a/cts/setup.sh b/cts/install.sh similarity index 100% rename from cts/setup.sh rename to cts/install.sh diff --git a/cts/setup/adminpwd.sql b/cts/install/adminpwd.sql similarity index 100% rename from cts/setup/adminpwd.sql rename to cts/install/adminpwd.sql diff --git a/cts/setup/createdb.sql b/cts/install/createdb.sql similarity index 100% rename from cts/setup/createdb.sql rename to cts/install/createdb.sql diff --git a/cts/setup/etc/init.d/cts b/cts/install/etc/init.d/cts similarity index 100% rename from cts/setup/etc/init.d/cts rename to cts/install/etc/init.d/cts diff --git a/cts/setup/srv/cts/conf/spotter.py b/cts/install/srv/cts/conf/spotter.py similarity index 100% rename from cts/setup/srv/cts/conf/spotter.py rename to cts/install/srv/cts/conf/spotter.py diff --git a/cts/setup/srv/cts/update-conf.sh b/cts/install/srv/cts/update-conf.sh similarity index 100% rename from cts/setup/srv/cts/update-conf.sh rename to cts/install/srv/cts/update-conf.sh diff --git a/frontlinesms/setup.sh b/frontlinesms/install.sh similarity index 100% rename from frontlinesms/setup.sh rename to frontlinesms/install.sh diff --git a/frontlinesms/setup/etc/init.d/frontlinesms b/frontlinesms/install/etc/init.d/frontlinesms similarity index 100% rename from frontlinesms/setup/etc/init.d/frontlinesms rename to frontlinesms/install/etc/init.d/frontlinesms diff --git a/frontlinesms/setup/srv/frontlinesms/data/app-settings.properties b/frontlinesms/install/srv/frontlinesms/data/app-settings.properties similarity index 100% rename from frontlinesms/setup/srv/frontlinesms/data/app-settings.properties rename to frontlinesms/install/srv/frontlinesms/data/app-settings.properties diff --git a/gnuhealth/setup.sh b/gnuhealth/install.sh similarity index 100% rename from gnuhealth/setup.sh rename to gnuhealth/install.sh diff --git a/gnuhealth/setup/createdb.sql b/gnuhealth/install/createdb.sql similarity index 100% rename from gnuhealth/setup/createdb.sql rename to gnuhealth/install/createdb.sql diff --git a/gnuhealth/setup/etc/init.d/gnuhealth b/gnuhealth/install/etc/init.d/gnuhealth similarity index 100% rename from gnuhealth/setup/etc/init.d/gnuhealth rename to gnuhealth/install/etc/init.d/gnuhealth diff --git a/gnuhealth/setup/srv/gnuhealth/conf/trytond.conf b/gnuhealth/install/srv/gnuhealth/conf/trytond.conf similarity index 100% rename from gnuhealth/setup/srv/gnuhealth/conf/trytond.conf rename to gnuhealth/install/srv/gnuhealth/conf/trytond.conf diff --git a/gnuhealth/setup/srv/gnuhealth/update-conf.sh b/gnuhealth/install/srv/gnuhealth/update-conf.sh similarity index 100% rename from gnuhealth/setup/srv/gnuhealth/update-conf.sh rename to gnuhealth/install/srv/gnuhealth/update-conf.sh diff --git a/kanboard/setup.sh b/kanboard/install.sh similarity index 100% rename from kanboard/setup.sh rename to kanboard/install.sh diff --git a/kanboard/setup/adminpwd.sql b/kanboard/install/adminpwd.sql similarity index 100% rename from kanboard/setup/adminpwd.sql rename to kanboard/install/adminpwd.sql diff --git a/kanboard/setup/createdb.sql b/kanboard/install/createdb.sql similarity index 100% rename from kanboard/setup/createdb.sql rename to kanboard/install/createdb.sql diff --git a/kanboard/setup/etc/init.d/kanboard b/kanboard/install/etc/init.d/kanboard similarity index 100% rename from kanboard/setup/etc/init.d/kanboard rename to kanboard/install/etc/init.d/kanboard diff --git a/kanboard/setup/etc/periodic/daily/kanboard b/kanboard/install/etc/periodic/daily/kanboard similarity index 100% rename from kanboard/setup/etc/periodic/daily/kanboard rename to kanboard/install/etc/periodic/daily/kanboard diff --git a/kanboard/setup/srv/kanboard/conf/config.php b/kanboard/install/srv/kanboard/conf/config.php similarity index 100% rename from kanboard/setup/srv/kanboard/conf/config.php rename to kanboard/install/srv/kanboard/conf/config.php diff --git a/kanboard/setup/srv/kanboard/update-conf.sh b/kanboard/install/srv/kanboard/update-conf.sh similarity index 100% rename from kanboard/setup/srv/kanboard/update-conf.sh rename to kanboard/install/srv/kanboard/update-conf.sh diff --git a/mariadb/setup.sh b/mariadb/install.sh similarity index 100% rename from mariadb/setup.sh rename to mariadb/install.sh diff --git a/mariadb/setup/adminpwd.sql b/mariadb/install/adminpwd.sql similarity index 100% rename from mariadb/setup/adminpwd.sql rename to mariadb/install/adminpwd.sql diff --git a/mariadb/setup/etc/init.d/mariadb b/mariadb/install/etc/init.d/mariadb similarity index 100% rename from mariadb/setup/etc/init.d/mariadb rename to mariadb/install/etc/init.d/mariadb diff --git a/mariadb/setup/srv/mariadb/conf/my.cnf b/mariadb/install/srv/mariadb/conf/my.cnf similarity index 100% rename from mariadb/setup/srv/mariadb/conf/my.cnf rename to mariadb/install/srv/mariadb/conf/my.cnf diff --git a/mifosx/setup.sh b/mifosx/install.sh similarity index 100% rename from mifosx/setup.sh rename to mifosx/install.sh diff --git a/mifosx/setup/adminpwd.sql b/mifosx/install/adminpwd.sql similarity index 100% rename from mifosx/setup/adminpwd.sql rename to mifosx/install/adminpwd.sql diff --git a/mifosx/setup/createdb.sql b/mifosx/install/createdb.sql similarity index 100% rename from mifosx/setup/createdb.sql rename to mifosx/install/createdb.sql diff --git a/mifosx/setup/etc/init.d/mifosx b/mifosx/install/etc/init.d/mifosx similarity index 100% rename from mifosx/setup/etc/init.d/mifosx rename to mifosx/install/etc/init.d/mifosx diff --git a/mifosx/setup/schemapwd.sql b/mifosx/install/schemapwd.sql similarity index 100% rename from mifosx/setup/schemapwd.sql rename to mifosx/install/schemapwd.sql diff --git a/mifosx/setup/srv/mifosx/conf/context.xml b/mifosx/install/srv/mifosx/conf/context.xml similarity index 100% rename from mifosx/setup/srv/mifosx/conf/context.xml rename to mifosx/install/srv/mifosx/conf/context.xml diff --git a/mifosx/setup/srv/mifosx/conf/server.xml b/mifosx/install/srv/mifosx/conf/server.xml similarity index 100% rename from mifosx/setup/srv/mifosx/conf/server.xml rename to mifosx/install/srv/mifosx/conf/server.xml diff --git a/mifosx/setup/srv/mifosx/update-conf.sh b/mifosx/install/srv/mifosx/update-conf.sh similarity index 100% rename from mifosx/setup/srv/mifosx/update-conf.sh rename to mifosx/install/srv/mifosx/update-conf.sh diff --git a/motech/setup.sh b/motech/install.sh similarity index 100% rename from motech/setup.sh rename to motech/install.sh diff --git a/motech/setup/createdb.sql b/motech/install/createdb.sql similarity index 100% rename from motech/setup/createdb.sql rename to motech/install/createdb.sql diff --git a/motech/setup/etc/init.d/motech b/motech/install/etc/init.d/motech similarity index 100% rename from motech/setup/etc/init.d/motech rename to motech/install/etc/init.d/motech diff --git a/motech/setup/srv/motech/conf/config-locations.properties b/motech/install/srv/motech/conf/config-locations.properties similarity index 100% rename from motech/setup/srv/motech/conf/config-locations.properties rename to motech/install/srv/motech/conf/config-locations.properties diff --git a/motech/setup/srv/motech/conf/config/bootstrap.properties b/motech/install/srv/motech/conf/config/bootstrap.properties similarity index 100% rename from motech/setup/srv/motech/conf/config/bootstrap.properties rename to motech/install/srv/motech/conf/config/bootstrap.properties diff --git a/motech/setup/srv/motech/conf/config/motech-settings.properties b/motech/install/srv/motech/conf/config/motech-settings.properties similarity index 100% rename from motech/setup/srv/motech/conf/config/motech-settings.properties rename to motech/install/srv/motech/conf/config/motech-settings.properties diff --git a/motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties b/motech/install/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties similarity index 100% rename from motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties rename to motech/install/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties diff --git a/motech/setup/srv/motech/update-conf.sh b/motech/install/srv/motech/update-conf.sh similarity index 100% rename from motech/setup/srv/motech/update-conf.sh rename to motech/install/srv/motech/update-conf.sh diff --git a/opendatakit-build/setup.sh b/opendatakit-build/install.sh similarity index 100% rename from opendatakit-build/setup.sh rename to opendatakit-build/install.sh diff --git a/opendatakit-build/setup/createdb.sql b/opendatakit-build/install/createdb.sql similarity index 100% rename from opendatakit-build/setup/createdb.sql rename to opendatakit-build/install/createdb.sql diff --git a/opendatakit-build/setup/etc/init.d/opendatakit-build b/opendatakit-build/install/etc/init.d/opendatakit-build similarity index 100% rename from opendatakit-build/setup/etc/init.d/opendatakit-build rename to opendatakit-build/install/etc/init.d/opendatakit-build diff --git a/opendatakit-build/setup/srv/opendatakit-build/conf/config.yml b/opendatakit-build/install/srv/opendatakit-build/conf/config.yml similarity index 100% rename from opendatakit-build/setup/srv/opendatakit-build/conf/config.yml rename to opendatakit-build/install/srv/opendatakit-build/conf/config.yml diff --git a/opendatakit/setup.sh b/opendatakit/install.sh similarity index 100% rename from opendatakit/setup.sh rename to opendatakit/install.sh diff --git a/opendatakit/setup/adminpwd.sql b/opendatakit/install/adminpwd.sql similarity index 100% rename from opendatakit/setup/adminpwd.sql rename to opendatakit/install/adminpwd.sql diff --git a/opendatakit/setup/createdb.sql b/opendatakit/install/createdb.sql similarity index 100% rename from opendatakit/setup/createdb.sql rename to opendatakit/install/createdb.sql diff --git a/opendatakit/setup/etc/init.d/opendatakit b/opendatakit/install/etc/init.d/opendatakit similarity index 100% rename from opendatakit/setup/etc/init.d/opendatakit rename to opendatakit/install/etc/init.d/opendatakit diff --git a/opendatakit/setup/srv/opendatakit/conf/jdbc.properties b/opendatakit/install/srv/opendatakit/conf/jdbc.properties similarity index 100% rename from opendatakit/setup/srv/opendatakit/conf/jdbc.properties rename to opendatakit/install/srv/opendatakit/conf/jdbc.properties diff --git a/opendatakit/setup/srv/opendatakit/conf/security.properties b/opendatakit/install/srv/opendatakit/conf/security.properties similarity index 100% rename from opendatakit/setup/srv/opendatakit/conf/security.properties rename to opendatakit/install/srv/opendatakit/conf/security.properties diff --git a/opendatakit/setup/srv/opendatakit/conf/server.xml b/opendatakit/install/srv/opendatakit/conf/server.xml similarity index 100% rename from opendatakit/setup/srv/opendatakit/conf/server.xml rename to opendatakit/install/srv/opendatakit/conf/server.xml diff --git a/opendatakit/setup/srv/opendatakit/update-conf.sh b/opendatakit/install/srv/opendatakit/update-conf.sh similarity index 100% rename from opendatakit/setup/srv/opendatakit/update-conf.sh rename to opendatakit/install/srv/opendatakit/update-conf.sh diff --git a/openmapkit/setup.sh b/openmapkit/install.sh similarity index 100% rename from openmapkit/setup.sh rename to openmapkit/install.sh diff --git a/openmapkit/setup/etc/init.d/openmapkit b/openmapkit/install/etc/init.d/openmapkit similarity index 100% rename from openmapkit/setup/etc/init.d/openmapkit rename to openmapkit/install/etc/init.d/openmapkit diff --git a/openmapkit/setup/srv/openmapkit/conf/settings.js b/openmapkit/install/srv/openmapkit/conf/settings.js similarity index 100% rename from openmapkit/setup/srv/openmapkit/conf/settings.js rename to openmapkit/install/srv/openmapkit/conf/settings.js diff --git a/pandora/setup.sh b/pandora/install.sh similarity index 100% rename from pandora/setup.sh rename to pandora/install.sh diff --git a/pandora/setup/adminpwd.sql b/pandora/install/adminpwd.sql similarity index 100% rename from pandora/setup/adminpwd.sql rename to pandora/install/adminpwd.sql diff --git a/pandora/setup/createdb.sql b/pandora/install/createdb.sql similarity index 100% rename from pandora/setup/createdb.sql rename to pandora/install/createdb.sql diff --git a/pandora/setup/etc/init.d/pandora b/pandora/install/etc/init.d/pandora similarity index 100% rename from pandora/setup/etc/init.d/pandora rename to pandora/install/etc/init.d/pandora diff --git a/pandora/setup/srv/pandora/conf/config.jsonc b/pandora/install/srv/pandora/conf/config.jsonc similarity index 100% rename from pandora/setup/srv/pandora/conf/config.jsonc rename to pandora/install/srv/pandora/conf/config.jsonc diff --git a/pandora/setup/srv/pandora/conf/gunicorn_config.py b/pandora/install/srv/pandora/conf/gunicorn_config.py similarity index 100% rename from pandora/setup/srv/pandora/conf/gunicorn_config.py rename to pandora/install/srv/pandora/conf/gunicorn_config.py diff --git a/pandora/setup/srv/pandora/conf/local_settings.py b/pandora/install/srv/pandora/conf/local_settings.py similarity index 100% rename from pandora/setup/srv/pandora/conf/local_settings.py rename to pandora/install/srv/pandora/conf/local_settings.py diff --git a/pandora/setup/srv/pandora/update-conf.sh b/pandora/install/srv/pandora/update-conf.sh similarity index 100% rename from pandora/setup/srv/pandora/update-conf.sh rename to pandora/install/srv/pandora/update-conf.sh diff --git a/postgres/setup.sh b/postgres/install.sh similarity index 100% rename from postgres/setup.sh rename to postgres/install.sh diff --git a/postgres/setup/etc/init.d/postgres b/postgres/install/etc/init.d/postgres similarity index 100% rename from postgres/setup/etc/init.d/postgres rename to postgres/install/etc/init.d/postgres diff --git a/postgres/setup/srv/postgres/data/pg_hba.conf b/postgres/install/srv/postgres/data/pg_hba.conf similarity index 100% rename from postgres/setup/srv/postgres/data/pg_hba.conf rename to postgres/install/srv/postgres/data/pg_hba.conf diff --git a/postgres/setup/srv/postgres/data/postgresql.conf b/postgres/install/srv/postgres/data/postgresql.conf similarity index 100% rename from postgres/setup/srv/postgres/data/postgresql.conf rename to postgres/install/srv/postgres/data/postgresql.conf diff --git a/rabbitmq/setup.sh b/rabbitmq/install.sh similarity index 100% rename from rabbitmq/setup.sh rename to rabbitmq/install.sh diff --git a/rabbitmq/setup/etc/init.d/rabbitmq b/rabbitmq/install/etc/init.d/rabbitmq similarity index 100% rename from rabbitmq/setup/etc/init.d/rabbitmq rename to rabbitmq/install/etc/init.d/rabbitmq diff --git a/redis/setup.sh b/redis/install.sh similarity index 100% rename from redis/setup.sh rename to redis/install.sh diff --git a/redis/setup/etc/init.d/redis b/redis/install/etc/init.d/redis similarity index 100% rename from redis/setup/etc/init.d/redis rename to redis/install/etc/init.d/redis diff --git a/redis/setup/srv/redis/conf/redis.conf b/redis/install/srv/redis/conf/redis.conf similarity index 100% rename from redis/setup/srv/redis/conf/redis.conf rename to redis/install/srv/redis/conf/redis.conf diff --git a/sahana-demo/setup.sh b/sahana-demo/install.sh similarity index 100% rename from sahana-demo/setup.sh rename to sahana-demo/install.sh diff --git a/sahana-demo/setup/createdb.sql b/sahana-demo/install/createdb.sql similarity index 100% rename from sahana-demo/setup/createdb.sql rename to sahana-demo/install/createdb.sql diff --git a/sahana-demo/setup/etc/init.d/sahana-demo b/sahana-demo/install/etc/init.d/sahana-demo similarity index 100% rename from sahana-demo/setup/etc/init.d/sahana-demo rename to sahana-demo/install/etc/init.d/sahana-demo diff --git a/sahana-demo/setup/masterUsers.csv b/sahana-demo/install/masterUsers.csv similarity index 100% rename from sahana-demo/setup/masterUsers.csv rename to sahana-demo/install/masterUsers.csv diff --git a/sahana-demo/setup/srv/sahana-demo/conf/000_config.py b/sahana-demo/install/srv/sahana-demo/conf/000_config.py similarity index 100% rename from sahana-demo/setup/srv/sahana-demo/conf/000_config.py rename to sahana-demo/install/srv/sahana-demo/conf/000_config.py diff --git a/sahana-demo/setup/srv/sahana-demo/update-conf.sh b/sahana-demo/install/srv/sahana-demo/update-conf.sh similarity index 100% rename from sahana-demo/setup/srv/sahana-demo/update-conf.sh rename to sahana-demo/install/srv/sahana-demo/update-conf.sh diff --git a/sahana/setup.sh b/sahana/install.sh similarity index 100% rename from sahana/setup.sh rename to sahana/install.sh diff --git a/sahana/setup/createdb.sql b/sahana/install/createdb.sql similarity index 100% rename from sahana/setup/createdb.sql rename to sahana/install/createdb.sql diff --git a/sahana/setup/etc/init.d/sahana b/sahana/install/etc/init.d/sahana similarity index 100% rename from sahana/setup/etc/init.d/sahana rename to sahana/install/etc/init.d/sahana diff --git a/sahana/setup/srv/sahana/conf/000_config.py b/sahana/install/srv/sahana/conf/000_config.py similarity index 100% rename from sahana/setup/srv/sahana/conf/000_config.py rename to sahana/install/srv/sahana/conf/000_config.py diff --git a/sahana/setup/srv/sahana/conf/00_settings.py b/sahana/install/srv/sahana/conf/00_settings.py similarity index 100% rename from sahana/setup/srv/sahana/conf/00_settings.py rename to sahana/install/srv/sahana/conf/00_settings.py diff --git a/sahana/setup/srv/sahana/data/Spotter/DefaultItems.csv b/sahana/install/srv/sahana/data/Spotter/DefaultItems.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/DefaultItems.csv rename to sahana/install/srv/sahana/data/Spotter/DefaultItems.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/DefaultSkillCompetency.csv b/sahana/install/srv/sahana/data/Spotter/DefaultSkillCompetency.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/DefaultSkillCompetency.csv rename to sahana/install/srv/sahana/data/Spotter/DefaultSkillCompetency.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/DefaultSkillList.csv b/sahana/install/srv/sahana/data/Spotter/DefaultSkillList.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/DefaultSkillList.csv rename to sahana/install/srv/sahana/data/Spotter/DefaultSkillList.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/DrivingSkillList.csv b/sahana/install/srv/sahana/data/Spotter/DrivingSkillList.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/DrivingSkillList.csv rename to sahana/install/srv/sahana/data/Spotter/DrivingSkillList.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/DrivingSkillList_EU.csv b/sahana/install/srv/sahana/data/Spotter/DrivingSkillList_EU.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/DrivingSkillList_EU.csv rename to sahana/install/srv/sahana/data/Spotter/DrivingSkillList_EU.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/LanguageCompetency.csv b/sahana/install/srv/sahana/data/Spotter/LanguageCompetency.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/LanguageCompetency.csv rename to sahana/install/srv/sahana/data/Spotter/LanguageCompetency.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/LanguageSkillList.csv b/sahana/install/srv/sahana/data/Spotter/LanguageSkillList.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/LanguageSkillList.csv rename to sahana/install/srv/sahana/data/Spotter/LanguageSkillList.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/StandardItems.csv b/sahana/install/srv/sahana/data/Spotter/StandardItems.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/StandardItems.csv rename to sahana/install/srv/sahana/data/Spotter/StandardItems.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/__init__.py b/sahana/install/srv/sahana/data/Spotter/__init__.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/__init__.py rename to sahana/install/srv/sahana/data/Spotter/__init__.py diff --git a/sahana/setup/srv/sahana/data/Spotter/auth_roles.csv b/sahana/install/srv/sahana/data/Spotter/auth_roles.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/auth_roles.csv rename to sahana/install/srv/sahana/data/Spotter/auth_roles.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/certificate.csv b/sahana/install/srv/sahana/data/Spotter/certificate.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/certificate.csv rename to sahana/install/srv/sahana/data/Spotter/certificate.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/cms_post.csv b/sahana/install/srv/sahana/data/Spotter/cms_post.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/cms_post.csv rename to sahana/install/srv/sahana/data/Spotter/cms_post.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/config.py b/sahana/install/srv/sahana/data/Spotter/config.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/config.py rename to sahana/install/srv/sahana/data/Spotter/config.py diff --git a/sahana/setup/srv/sahana/data/Spotter/css.cfg b/sahana/install/srv/sahana/data/Spotter/css.cfg similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/css.cfg rename to sahana/install/srv/sahana/data/Spotter/css.cfg diff --git a/sahana/setup/srv/sahana/data/Spotter/dvr_case_status.csv b/sahana/install/srv/sahana/data/Spotter/dvr_case_status.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/dvr_case_status.csv rename to sahana/install/srv/sahana/data/Spotter/dvr_case_status.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/event_type.csv b/sahana/install/srv/sahana/data/Spotter/event_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/event_type.csv rename to sahana/install/srv/sahana/data/Spotter/event_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_config.csv b/sahana/install/srv/sahana/data/Spotter/gis_config.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_config.csv rename to sahana/install/srv/sahana/data/Spotter/gis_config.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_hierarchy.csv b/sahana/install/srv/sahana/data/Spotter/gis_hierarchy.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_hierarchy.csv rename to sahana/install/srv/sahana/data/Spotter/gis_hierarchy.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_bing.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_bing.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_bing.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_bing.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_coordinate.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_coordinate.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_coordinate.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_coordinate.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_feature.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_feature.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_feature.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_feature.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_geojson.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_geojson.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_geojson.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_geojson.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_georss.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_georss.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_georss.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_georss.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_google.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_google.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_google.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_google.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_mgrs.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_mgrs.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_mgrs.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_mgrs.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_openstreetmap.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_openstreetmap.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_openstreetmap.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_openstreetmap.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_openweathermap.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_openweathermap.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_openweathermap.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_openweathermap.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_tms.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_tms.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_tms.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_tms.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_layer_wms.csv b/sahana/install/srv/sahana/data/Spotter/gis_layer_wms.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_layer_wms.csv rename to sahana/install/srv/sahana/data/Spotter/gis_layer_wms.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/gis_marker.csv b/sahana/install/srv/sahana/data/Spotter/gis_marker.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/gis_marker.csv rename to sahana/install/srv/sahana/data/Spotter/gis_marker.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/incident_type.csv b/sahana/install/srv/sahana/data/Spotter/incident_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/incident_type.csv rename to sahana/install/srv/sahana/data/Spotter/incident_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/layouts.py b/sahana/install/srv/sahana/data/Spotter/layouts.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/layouts.py rename to sahana/install/srv/sahana/data/Spotter/layouts.py diff --git a/sahana/setup/srv/sahana/data/Spotter/maintenance.py b/sahana/install/srv/sahana/data/Spotter/maintenance.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/maintenance.py rename to sahana/install/srv/sahana/data/Spotter/maintenance.py diff --git a/sahana/setup/srv/sahana/data/Spotter/masterUsers.csv b/sahana/install/srv/sahana/data/Spotter/masterUsers.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/masterUsers.csv rename to sahana/install/srv/sahana/data/Spotter/masterUsers.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/membership_type.csv b/sahana/install/srv/sahana/data/Spotter/membership_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/membership_type.csv rename to sahana/install/srv/sahana/data/Spotter/membership_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/menus.py b/sahana/install/srv/sahana/data/Spotter/menus.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/menus.py rename to sahana/install/srv/sahana/data/Spotter/menus.py diff --git a/sahana/setup/srv/sahana/data/Spotter/monitor.py b/sahana/install/srv/sahana/data/Spotter/monitor.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/monitor.py rename to sahana/install/srv/sahana/data/Spotter/monitor.py diff --git a/sahana/setup/srv/sahana/data/Spotter/office_type.csv b/sahana/install/srv/sahana/data/Spotter/office_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/office_type.csv rename to sahana/install/srv/sahana/data/Spotter/office_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/org_sector.csv b/sahana/install/srv/sahana/data/Spotter/org_sector.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/org_sector.csv rename to sahana/install/srv/sahana/data/Spotter/org_sector.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/organisation_type.csv b/sahana/install/srv/sahana/data/Spotter/organisation_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/organisation_type.csv rename to sahana/install/srv/sahana/data/Spotter/organisation_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/parser.py b/sahana/install/srv/sahana/data/Spotter/parser.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/parser.py rename to sahana/install/srv/sahana/data/Spotter/parser.py diff --git a/sahana/setup/srv/sahana/data/Spotter/project_activity_type.csv b/sahana/install/srv/sahana/data/Spotter/project_activity_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/project_activity_type.csv rename to sahana/install/srv/sahana/data/Spotter/project_activity_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/project_beneficiary_type.csv b/sahana/install/srv/sahana/data/Spotter/project_beneficiary_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/project_beneficiary_type.csv rename to sahana/install/srv/sahana/data/Spotter/project_beneficiary_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/project_hazard.csv b/sahana/install/srv/sahana/data/Spotter/project_hazard.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/project_hazard.csv rename to sahana/install/srv/sahana/data/Spotter/project_hazard.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/project_status.csv b/sahana/install/srv/sahana/data/Spotter/project_status.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/project_status.csv rename to sahana/install/srv/sahana/data/Spotter/project_status.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/project_theme.csv b/sahana/install/srv/sahana/data/Spotter/project_theme.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/project_theme.csv rename to sahana/install/srv/sahana/data/Spotter/project_theme.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/shelter_type.csv b/sahana/install/srv/sahana/data/Spotter/shelter_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/shelter_type.csv rename to sahana/install/srv/sahana/data/Spotter/shelter_type.csv diff --git a/sahana/setup/srv/sahana/data/Spotter/tasks.cfg b/sahana/install/srv/sahana/data/Spotter/tasks.cfg similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/tasks.cfg rename to sahana/install/srv/sahana/data/Spotter/tasks.cfg diff --git a/sahana/setup/srv/sahana/data/Spotter/tests.py b/sahana/install/srv/sahana/data/Spotter/tests.py similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/tests.py rename to sahana/install/srv/sahana/data/Spotter/tests.py diff --git a/sahana/setup/srv/sahana/data/Spotter/views/footer.html b/sahana/install/srv/sahana/data/Spotter/views/footer.html similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/views/footer.html rename to sahana/install/srv/sahana/data/Spotter/views/footer.html diff --git a/sahana/setup/srv/sahana/data/Spotter/views/layout.html b/sahana/install/srv/sahana/data/Spotter/views/layout.html similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/views/layout.html rename to sahana/install/srv/sahana/data/Spotter/views/layout.html diff --git a/sahana/setup/srv/sahana/data/Spotter/work_job_type.csv b/sahana/install/srv/sahana/data/Spotter/work_job_type.csv similarity index 100% rename from sahana/setup/srv/sahana/data/Spotter/work_job_type.csv rename to sahana/install/srv/sahana/data/Spotter/work_job_type.csv diff --git a/sahana/setup/srv/sahana/update-conf.sh b/sahana/install/srv/sahana/update-conf.sh similarity index 100% rename from sahana/setup/srv/sahana/update-conf.sh rename to sahana/install/srv/sahana/update-conf.sh diff --git a/sambro/setup.sh b/sambro/install.sh similarity index 100% rename from sambro/setup.sh rename to sambro/install.sh diff --git a/sambro/setup/createdb.sql b/sambro/install/createdb.sql similarity index 100% rename from sambro/setup/createdb.sql rename to sambro/install/createdb.sql diff --git a/sambro/setup/etc/init.d/sambro b/sambro/install/etc/init.d/sambro similarity index 100% rename from sambro/setup/etc/init.d/sambro rename to sambro/install/etc/init.d/sambro diff --git a/sambro/setup/masterUsers.csv b/sambro/install/masterUsers.csv similarity index 100% rename from sambro/setup/masterUsers.csv rename to sambro/install/masterUsers.csv diff --git a/sambro/setup/srv/sambro/conf/000_config.py b/sambro/install/srv/sambro/conf/000_config.py similarity index 100% rename from sambro/setup/srv/sambro/conf/000_config.py rename to sambro/install/srv/sambro/conf/000_config.py diff --git a/sambro/setup/srv/sambro/conf/00_settings.py b/sambro/install/srv/sambro/conf/00_settings.py similarity index 100% rename from sambro/setup/srv/sambro/conf/00_settings.py rename to sambro/install/srv/sambro/conf/00_settings.py diff --git a/sambro/setup/srv/sambro/data/SAMBRO/config.py b/sambro/install/srv/sambro/data/SAMBRO/config.py similarity index 100% rename from sambro/setup/srv/sambro/data/SAMBRO/config.py rename to sambro/install/srv/sambro/data/SAMBRO/config.py diff --git a/sambro/setup/srv/sambro/update-conf.sh b/sambro/install/srv/sambro/update-conf.sh similarity index 100% rename from sambro/setup/srv/sambro/update-conf.sh rename to sambro/install/srv/sambro/update-conf.sh diff --git a/seeddms/setup.sh b/seeddms/install.sh similarity index 100% rename from seeddms/setup.sh rename to seeddms/install.sh diff --git a/seeddms/setup/adminpwd.sql b/seeddms/install/adminpwd.sql similarity index 100% rename from seeddms/setup/adminpwd.sql rename to seeddms/install/adminpwd.sql diff --git a/seeddms/setup/createdb.sql b/seeddms/install/createdb.sql similarity index 100% rename from seeddms/setup/createdb.sql rename to seeddms/install/createdb.sql diff --git a/seeddms/setup/custom.sql b/seeddms/install/custom.sql similarity index 100% rename from seeddms/setup/custom.sql rename to seeddms/install/custom.sql diff --git a/seeddms/setup/etc/init.d/seeddms b/seeddms/install/etc/init.d/seeddms similarity index 100% rename from seeddms/setup/etc/init.d/seeddms rename to seeddms/install/etc/init.d/seeddms diff --git a/seeddms/setup/etc/periodic/hourly/seeddms b/seeddms/install/etc/periodic/hourly/seeddms similarity index 100% rename from seeddms/setup/etc/periodic/hourly/seeddms rename to seeddms/install/etc/periodic/hourly/seeddms diff --git a/seeddms/setup/srv/seeddms/conf/settings.xml b/seeddms/install/srv/seeddms/conf/settings.xml similarity index 100% rename from seeddms/setup/srv/seeddms/conf/settings.xml rename to seeddms/install/srv/seeddms/conf/settings.xml diff --git a/seeddms/setup/srv/seeddms/update-conf.sh b/seeddms/install/srv/seeddms/update-conf.sh similarity index 100% rename from seeddms/setup/srv/seeddms/update-conf.sh rename to seeddms/install/srv/seeddms/update-conf.sh diff --git a/sigmah/setup.sh b/sigmah/install.sh similarity index 100% rename from sigmah/setup.sh rename to sigmah/install.sh diff --git a/sigmah/setup/createdb.sql b/sigmah/install/createdb.sql similarity index 100% rename from sigmah/setup/createdb.sql rename to sigmah/install/createdb.sql diff --git a/sigmah/setup/etc/init.d/sigmah b/sigmah/install/etc/init.d/sigmah similarity index 100% rename from sigmah/setup/etc/init.d/sigmah rename to sigmah/install/etc/init.d/sigmah diff --git a/sigmah/setup/srv/sigmah/conf/persistence.xml b/sigmah/install/srv/sigmah/conf/persistence.xml similarity index 100% rename from sigmah/setup/srv/sigmah/conf/persistence.xml rename to sigmah/install/srv/sigmah/conf/persistence.xml diff --git a/sigmah/setup/srv/sigmah/conf/sigmah.properties b/sigmah/install/srv/sigmah/conf/sigmah.properties similarity index 100% rename from sigmah/setup/srv/sigmah/conf/sigmah.properties rename to sigmah/install/srv/sigmah/conf/sigmah.properties diff --git a/sigmah/setup/srv/sigmah/update-conf.sh b/sigmah/install/srv/sigmah/update-conf.sh similarity index 100% rename from sigmah/setup/srv/sigmah/update-conf.sh rename to sigmah/install/srv/sigmah/update-conf.sh diff --git a/solr/setup.sh b/solr/install.sh similarity index 100% rename from solr/setup.sh rename to solr/install.sh diff --git a/solr/setup/etc/init.d/solr b/solr/install/etc/init.d/solr similarity index 100% rename from solr/setup/etc/init.d/solr rename to solr/install/etc/init.d/solr diff --git a/ushahidi/setup.sh b/ushahidi/install.sh similarity index 100% rename from ushahidi/setup.sh rename to ushahidi/install.sh diff --git a/ushahidi/setup/adminpwd.sql b/ushahidi/install/adminpwd.sql similarity index 100% rename from ushahidi/setup/adminpwd.sql rename to ushahidi/install/adminpwd.sql diff --git a/ushahidi/setup/createdb.sql b/ushahidi/install/createdb.sql similarity index 100% rename from ushahidi/setup/createdb.sql rename to ushahidi/install/createdb.sql diff --git a/ushahidi/setup/etc/init.d/ushahidi b/ushahidi/install/etc/init.d/ushahidi similarity index 100% rename from ushahidi/setup/etc/init.d/ushahidi rename to ushahidi/install/etc/init.d/ushahidi diff --git a/ushahidi/setup/etc/periodic/15min/ushahidi b/ushahidi/install/etc/periodic/15min/ushahidi similarity index 100% rename from ushahidi/setup/etc/periodic/15min/ushahidi rename to ushahidi/install/etc/periodic/15min/ushahidi diff --git a/ushahidi/setup/srv/ushahidi/conf/config.json b/ushahidi/install/srv/ushahidi/conf/config.json similarity index 100% rename from ushahidi/setup/srv/ushahidi/conf/config.json rename to ushahidi/install/srv/ushahidi/conf/config.json diff --git a/ushahidi/setup/srv/ushahidi/conf/env b/ushahidi/install/srv/ushahidi/conf/env similarity index 100% rename from ushahidi/setup/srv/ushahidi/conf/env rename to ushahidi/install/srv/ushahidi/conf/env diff --git a/ushahidi/setup/srv/ushahidi/update-conf.sh b/ushahidi/install/srv/ushahidi/update-conf.sh similarity index 100% rename from ushahidi/setup/srv/ushahidi/update-conf.sh rename to ushahidi/install/srv/ushahidi/update-conf.sh diff --git a/zz-build/usr/bin/lxc-pack b/zz-build/usr/bin/lxc-pack index 907b1f6..33f9000 100755 --- a/zz-build/usr/bin/lxc-pack +++ b/zz-build/usr/bin/lxc-pack @@ -44,9 +44,11 @@ def pack(pkg_file): # If lxcpath doesn't point to layer but is a full-featured container, pack also scripts print('Archiving install/upgrade/uninstall scripts and related files') cwd = os.path.dirname(os.path.abspath(pkg_file)) - subprocess.run(['tar', '--transform' 's,^\.,/srv/{},'.format(pkg_name), '-rpf', tar_path, 'install', 'install.sh', 'upgrade', 'upgrade.sh', 'uninstall', 'uninstall.sh'], cwd=cwd) - print('Compressing', tar_path, '({} MB)'.format(os.path.getsize(tar_path)/1048576)) + subprocess.run(['tar', '--transform', 's|^|srv/{}/|'.format(pkg_name), '-rpf', tar_path, 'install', 'install.sh', 'upgrade', 'upgrade.sh', 'uninstall', 'uninstall.sh'], cwd=cwd) + # Compress the tarball with xz (LZMA2) + print('Compressing', tar_path, '({0:.2f} MB)'.format(os.path.getsize(tar_path)/1048576)) subprocess.run(['xz', '-9', tar_path]) + print('Compressed ', xz_path, '({0:.2f} MB)'.format(os.path.getsize(xz_path)/1048576)) # Register package print('Registering package')