From b5bf0a97c78f698d5c4dfcf86df04f3217222f3d Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Mon, 18 Aug 2014 17:28:44 +0200
Subject: [PATCH] Move unstable software to unstable folder

  All software releases which are consider unstable and not mantained were
 moved to "unstable" folder. This folder is aims to be the place for tests,
 experimentation, personal releases which are not updated or tested for long
 term support.
---
 software/erp5-util-testing/instance.cfg       |  62 ------
 software/jio/instance.cfg.in                  |  51 -----
 software/officejs/instance.cfg.in             |  51 -----
 software/slaprunner-lite/README.txt           |  30 ---
 software/slaprunner-lite/common.cfg           |  37 ----
 software/slaprunner-lite/development.cfg      |  48 -----
 software/slaprunner-lite/instance-runner.cfg  | 190 ------------------
 software/slaprunner-lite/instance.cfg         |  11 -
 .../{ => unstable}/MediaWiki/instance.cfg     |   0
 .../patch/mediawiki-1.17.0.config.patch       |   0
 .../{ => unstable}/MediaWiki/software.cfg     |   0
 software/{ => unstable}/agora/instance.cfg    |   0
 software/{ => unstable}/agora/software.cfg    |   0
 software/{ => unstable}/arfooo/instance.cfg   |   0
 software/{ => unstable}/arfooo/software.cfg   |   0
 .../{ => unstable}/b2evolution/instance.cfg   |   0
 .../{ => unstable}/b2evolution/software.cfg   |   0
 software/{ => unstable}/chamilo/instance.cfg  |   0
 software/{ => unstable}/chamilo/software.cfg  |   0
 .../{ => unstable}/claroline/instance.cfg     |   0
 .../{ => unstable}/claroline/software.cfg     |   0
 .../{ => unstable}/cmsmadesimple/instance.cfg |   0
 .../{ => unstable}/cmsmadesimple/software.cfg |   0
 .../{ => unstable}/condor/instance-condor.cfg |   0
 software/{ => unstable}/condor/instance.cfg   |   0
 software/{ => unstable}/condor/software.cfg   |   0
 .../{ => unstable}/condor/template/simple     | Bin
 .../{ => unstable}/condor/template/submit     |   0
 .../{ => unstable}/coppermine/instance.cfg    |   0
 .../{ => unstable}/coppermine/software.cfg    |   0
 .../coppermine/template/coppermine.inc.php.in |   0
 .../{ => unstable}/dokuwiki/mysql.conf.php.in |   0
 software/{ => unstable}/dokuwiki/software.cfg |   0
 software/{ => unstable}/dotclear/instance.cfg |   0
 software/{ => unstable}/dotclear/software.cfg |   0
 .../dotclear/template/dotclear.inc.php.in     |   0
 .../{ => unstable}/dotproject/instance.cfg    |   0
 .../{ => unstable}/dotproject/software.cfg    |   0
 .../dotproject/template/config.inc.php.in     |   0
 .../{ => unstable}/drupal/settings.php.in     |   0
 software/{ => unstable}/drupal/software.cfg   |   0
 .../drupal/system.theme.css.patch             |   0
 software/{ => unstable}/eSKUeL/instance.cfg   |   0
 software/{ => unstable}/eSKUeL/software.cfg   |   0
 .../{ => unstable}/ezpublish/instance.cfg     |   0
 .../{ => unstable}/ezpublish/software.cfg     |   0
 .../fengoffice/config-form.php.in             |   0
 .../{ => unstable}/fengoffice/software.cfg    |   0
 .../{ => unstable}/fluxbb/configure-fluxbb.py |   0
 software/{ => unstable}/fluxbb/instance.cfg   |   0
 software/{ => unstable}/fluxbb/software.cfg   |   0
 .../fluxbb/template/config.inc.php.in         |   0
 .../freeglobes/configure-freeglobes.py        |   0
 .../{ => unstable}/freeglobes/instance.cfg    |   0
 .../{ => unstable}/freeglobes/software.cfg    |   0
 .../{ => unstable}/freewebshop/instance.cfg   |   0
 .../{ => unstable}/freewebshop/software.cfg   |   0
 .../frontaccounting/instance.cfg              |   0
 .../frontaccounting/software.cfg              |   0
 .../{ => unstable}/fusionnews/instance.cfg    |   0
 .../{ => unstable}/fusionnews/software.cfg    |   0
 software/{ => unstable}/galette/instance.cfg  |   0
 software/{ => unstable}/galette/software.cfg  |   0
 software/{ => unstable}/glpi/instance.cfg     |   0
 software/{ => unstable}/glpi/software.cfg     |   0
 software/{ => unstable}/guppy/instance.cfg    |   0
 software/{ => unstable}/guppy/software.cfg    |   0
 software/{ => unstable}/igalerie/instance.cfg |   0
 software/{ => unstable}/igalerie/software.cfg |   0
 .../{ => unstable}/joomla/database.xml-in     |   0
 software/{ => unstable}/joomla/instance.cfg   |   0
 software/{ => unstable}/joomla/software.cfg   |   0
 software/{ => unstable}/kubeblog/instance.cfg |   0
 software/{ => unstable}/kubeblog/software.cfg |   0
 .../{ => unstable}/lamp-generic/README.txt    |   0
 .../lamp-generic/development.cfg              |   0
 .../lamp-generic/instance-apache-php.cfg.in   |   0
 .../lamp-generic/instance-edge.cfg.in         |   0
 .../lamp-generic/instance.cfg.in              |   0
 .../{ => unstable}/lamp-generic/software.cfg  |   0
 .../lamp-template-static/instance.cfg         |   0
 .../lamp-template-static/software.cfg         |   0
 .../libcloud-requester/instance.cfg           |   0
 .../libcloud-requester/software.cfg           |   0
 software/{ => unstable}/libcloud/instance.cfg |   0
 software/{ => unstable}/libcloud/software.cfg |   0
 software/{ => unstable}/lifetype/instance.cfg |   0
 .../lifetype/lifetype_for_mysql5.patch        |   0
 software/{ => unstable}/lifetype/software.cfg |   0
 .../{ => unstable}/lxc/check_exists.sh.in     |   0
 software/{ => unstable}/lxc/check_state.sh.in |   0
 software/{ => unstable}/lxc/instance-lxc.cfg  |   0
 software/{ => unstable}/lxc/instance.cfg      |   0
 software/{ => unstable}/lxc/lxc.conf.in       |   0
 software/{ => unstable}/lxc/rootfs.README     |   0
 software/{ => unstable}/lxc/software.cfg      |   0
 .../{ => unstable}/maarch/development.cfg     |   0
 .../maarch/instance-custom.cfg.in             |   0
 software/{ => unstable}/maarch/migration.txt  |   0
 software/{ => unstable}/maarch/software.cfg   |   0
 software/{ => unstable}/magento/instance.cfg  |   0
 software/{ => unstable}/magento/software.cfg  |   0
 software/{ => unstable}/mantis/instance.cfg   |   0
 software/{ => unstable}/mantis/software.cfg   |   0
 software/{ => unstable}/moodle/instance.cfg   |   0
 software/{ => unstable}/moodle/software.cfg   |   0
 .../{ => unstable}/moregroupware/instance.cfg |   0
 .../{ => unstable}/moregroupware/software.cfg |   0
 .../{ => unstable}/mybloggie/instance.cfg     |   0
 .../{ => unstable}/mybloggie/software.cfg     |   0
 .../{ => unstable}/mytinytodo/instance.cfg    |   0
 .../{ => unstable}/mytinytodo/software.cfg    |   0
 software/{ => unstable}/net2ftp/configure.py  |   0
 software/{ => unstable}/net2ftp/instance.cfg  |   0
 software/{ => unstable}/net2ftp/software.cfg  |   0
 .../net2ftp/template/net2ftp.inc.php.in       |   0
 .../{ => unstable}/newsevolution/instance.cfg |   0
 .../{ => unstable}/newsevolution/software.cfg |   0
 .../{ => unstable}/nosqltestbed/instance.cfg  |   0
 .../{ => unstable}/nosqltestbed/software.cfg  |   0
 .../nucleus/configure-nucleus.py              |   0
 software/{ => unstable}/nucleus/instance.cfg  |   0
 software/{ => unstable}/nucleus/software.cfg  |   0
 software/{ => unstable}/openX/instance.cfg    |   0
 software/{ => unstable}/openX/software.cfg    |   0
 .../openemr/configure-openemr.py              |   0
 software/{ => unstable}/openemr/instance.cfg  |   0
 software/{ => unstable}/openemr/software.cfg  |   0
 .../{ => unstable}/opengoo/config-form.php.in |   0
 software/{ => unstable}/opengoo/software.cfg  |   0
 .../{ => unstable}/os-commerce/instance.cfg   |   0
 .../{ => unstable}/os-commerce/software.cfg   |   0
 software/{ => unstable}/ouapi/instance.cfg    |   0
 software/{ => unstable}/ouapi/software.cfg    |   0
 software/{ => unstable}/owncloud/instance.cfg |   0
 software/{ => unstable}/owncloud/software.cfg |   0
 software/{ => unstable}/phenix/instance.cfg   |   0
 software/{ => unstable}/phenix/software.cfg   |   0
 software/{ => unstable}/phpbb/instance.cfg    |   0
 software/{ => unstable}/phpbb/software.cfg    |   0
 software/{ => unstable}/phpbms/instance.cfg   |   0
 .../phpbms/phpbms_for_mysql5.patch            |   0
 software/{ => unstable}/phpbms/software.cfg   |   0
 .../phpbms/template/settings.php.in           |   0
 .../{ => unstable}/phpfin/configure-phpfin.py |   0
 software/{ => unstable}/phpfin/instance.cfg   |   0
 software/{ => unstable}/phpfin/software.cfg   |   0
 .../phpfin/template/connection.inc.in         |   0
 software/{ => unstable}/phpip/instance.cfg    |   0
 software/{ => unstable}/phpip/software.cfg    |   0
 .../phpip/template/database.php.in            |   0
 .../{ => unstable}/phpmyadmin/instance.cfg    |   0
 .../phpmyadmin/phpmyadmin.inc.php.in          |   0
 .../{ => unstable}/phpmyadmin/software.cfg    |   0
 .../{ => unstable}/phpmybackup/instance.cfg   |   0
 .../{ => unstable}/phpmybackup/software.cfg   |   0
 software/{ => unstable}/phpmyfaq/instance.cfg |   0
 software/{ => unstable}/phpmyfaq/software.cfg |   0
 software/{ => unstable}/phpnuke/instance.cfg  |   0
 software/{ => unstable}/phpnuke/software.cfg  |   0
 .../phpnuke/template/phpnuke.inc.php.in       |   0
 .../{ => unstable}/phprojekt/instance.cfg     |   0
 .../{ => unstable}/phprojekt/software.cfg     |   0
 software/{ => unstable}/pimcore/instance.cfg  |   0
 software/{ => unstable}/pimcore/software.cfg  |   0
 software/{ => unstable}/piwigo/instance.cfg   |   0
 software/{ => unstable}/piwigo/software.cfg   |   0
 .../piwigo/template/piwigo.inc.php.in         |   0
 software/{ => unstable}/piwik/instance.cfg    |   0
 software/{ => unstable}/piwik/software.cfg    |   0
 .../{ => unstable}/pixelpost/instance.cfg     |   0
 .../pixelpost/pixelpost_for_mysql5.patch      |   0
 .../{ => unstable}/pixelpost/software.cfg     |   0
 .../{ => unstable}/prestashop/instance.cfg    |   0
 .../{ => unstable}/prestashop/software.cfg    |   0
 .../{ => unstable}/proactive/instance.cfg     |   0
 .../{ => unstable}/proactive/software.cfg     |   0
 .../{ => unstable}/projelead/instance.cfg     |   0
 .../{ => unstable}/projelead/software.cfg     |   0
 software/{ => unstable}/pulse/instance.cfg    |   0
 software/{ => unstable}/pulse/software.cfg    |   0
 software/{ => unstable}/punbb/instance.cfg    |   0
 software/{ => unstable}/punbb/software.cfg    |   0
 .../punbb/template/punbb.inc.php.in           |   0
 .../{ => unstable}/quick-cart/instance.cfg    |   0
 .../{ => unstable}/quick-cart/software.cfg    |   0
 .../{ => unstable}/quick-cms/instance.cfg     |   0
 .../{ => unstable}/quick-cms/software.cfg     |   0
 .../reverse-proxy-nginx/common.cfg            |   0
 .../reverse-proxy-nginx/development.cfg       |   0
 .../reverse-proxy-nginx/instance.cfg.in       |   0
 .../sheepdogtestbed/instance.cfg              |   0
 .../sheepdogtestbed/software.cfg              |   0
 .../{ => unstable}/silverstripe/instance.cfg  |   0
 .../{ => unstable}/silverstripe/software.cfg  |   0
 .../simple-invoicing/instance.cfg             |   0
 .../simple-invoicing/software.cfg             |   0
 .../simpleMachineForum/instance.cfg           |   0
 .../simpleMachineForum/software.cfg           |   0
 software/{ => unstable}/spip/instance.cfg     |   0
 software/{ => unstable}/spip/software.cfg     |   0
 .../{ => unstable}/statusnet/instance.cfg     |   0
 .../{ => unstable}/statusnet/software.cfg     |   0
 .../{ => unstable}/sugar-crm/instance.cfg     |   0
 .../{ => unstable}/sugar-crm/software.cfg     |   0
 software/{ => unstable}/thelia/instance.cfg   |   0
 software/{ => unstable}/thelia/software.cfg   |   0
 software/{ => unstable}/tiki/instance.cfg     |   0
 software/{ => unstable}/tiki/software.cfg     |   0
 .../{ => unstable}/tt-rss/development.cfg     |   0
 .../tt-rss/instance-custom.cfg.in             |   0
 .../{ => unstable}/tt-rss/script/tt-rss.sql   |   0
 software/{ => unstable}/tt-rss/software.cfg   |   0
 .../tt-rss/template/config.php.in             |   0
 .../ultimate-php-borad/instance.cfg           |   0
 .../ultimate-php-borad/software.cfg           |   0
 software/{ => unstable}/vifib/software.cfg    |   0
 .../{ => unstable}/web2project/instance.cfg   |   0
 .../{ => unstable}/web2project/software.cfg   |   0
 software/{ => unstable}/wikyblog/instance.cfg |   0
 software/{ => unstable}/wikyblog/software.cfg |   0
 software/{ => unstable}/xaraya/instance.cfg   |   0
 software/{ => unstable}/xaraya/software.cfg   |   0
 software/{ => unstable}/xellplan/instance.cfg |   0
 software/{ => unstable}/xellplan/software.cfg |   0
 .../xellplan/template/sfx.php.in              |   0
 software/{ => unstable}/xoops/instance.cfg    |   0
 software/{ => unstable}/xoops/software.cfg    |   0
 software/{ => unstable}/xwiki/instance.cfg    |   0
 software/{ => unstable}/xwiki/software.cfg    |   0
 software/{ => unstable}/zencart/configure.py  |   0
 software/{ => unstable}/zencart/instance.cfg  |   0
 software/{ => unstable}/zencart/software.cfg  |   0
 software/{ => unstable}/zenphoto/instance.cfg |   0
 software/{ => unstable}/zenphoto/software.cfg |   0
 .../{ => unstable}/zikula/configure-zikula.py |   0
 software/{ => unstable}/zikula/instance.cfg   |   0
 software/{ => unstable}/zikula/software.cfg   |   0
 software/{ => unstable}/zimbra-kvm/README.txt |   0
 software/{ => unstable}/zimbra-kvm/common.cfg |   0
 .../{ => unstable}/zimbra-kvm/development.cfg |   0
 .../zimbra-kvm/instance-kvm.cfg.in            |   0
 .../{ => unstable}/zimbra-kvm/instance.cfg.in |   0
 .../{ => unstable}/zimbra-kvm/software.cfg    |   0
 244 files changed, 480 deletions(-)
 delete mode 100644 software/erp5-util-testing/instance.cfg
 delete mode 100644 software/jio/instance.cfg.in
 delete mode 100644 software/officejs/instance.cfg.in
 delete mode 100644 software/slaprunner-lite/README.txt
 delete mode 100644 software/slaprunner-lite/common.cfg
 delete mode 100644 software/slaprunner-lite/development.cfg
 delete mode 100644 software/slaprunner-lite/instance-runner.cfg
 delete mode 100644 software/slaprunner-lite/instance.cfg
 rename software/{ => unstable}/MediaWiki/instance.cfg (100%)
 rename software/{ => unstable}/MediaWiki/patch/mediawiki-1.17.0.config.patch (100%)
 rename software/{ => unstable}/MediaWiki/software.cfg (100%)
 rename software/{ => unstable}/agora/instance.cfg (100%)
 rename software/{ => unstable}/agora/software.cfg (100%)
 rename software/{ => unstable}/arfooo/instance.cfg (100%)
 rename software/{ => unstable}/arfooo/software.cfg (100%)
 rename software/{ => unstable}/b2evolution/instance.cfg (100%)
 rename software/{ => unstable}/b2evolution/software.cfg (100%)
 rename software/{ => unstable}/chamilo/instance.cfg (100%)
 rename software/{ => unstable}/chamilo/software.cfg (100%)
 rename software/{ => unstable}/claroline/instance.cfg (100%)
 rename software/{ => unstable}/claroline/software.cfg (100%)
 rename software/{ => unstable}/cmsmadesimple/instance.cfg (100%)
 rename software/{ => unstable}/cmsmadesimple/software.cfg (100%)
 rename software/{ => unstable}/condor/instance-condor.cfg (100%)
 rename software/{ => unstable}/condor/instance.cfg (100%)
 rename software/{ => unstable}/condor/software.cfg (100%)
 rename software/{ => unstable}/condor/template/simple (100%)
 rename software/{ => unstable}/condor/template/submit (100%)
 rename software/{ => unstable}/coppermine/instance.cfg (100%)
 rename software/{ => unstable}/coppermine/software.cfg (100%)
 rename software/{ => unstable}/coppermine/template/coppermine.inc.php.in (100%)
 rename software/{ => unstable}/dokuwiki/mysql.conf.php.in (100%)
 rename software/{ => unstable}/dokuwiki/software.cfg (100%)
 rename software/{ => unstable}/dotclear/instance.cfg (100%)
 rename software/{ => unstable}/dotclear/software.cfg (100%)
 rename software/{ => unstable}/dotclear/template/dotclear.inc.php.in (100%)
 rename software/{ => unstable}/dotproject/instance.cfg (100%)
 rename software/{ => unstable}/dotproject/software.cfg (100%)
 rename software/{ => unstable}/dotproject/template/config.inc.php.in (100%)
 rename software/{ => unstable}/drupal/settings.php.in (100%)
 rename software/{ => unstable}/drupal/software.cfg (100%)
 rename software/{ => unstable}/drupal/system.theme.css.patch (100%)
 rename software/{ => unstable}/eSKUeL/instance.cfg (100%)
 rename software/{ => unstable}/eSKUeL/software.cfg (100%)
 rename software/{ => unstable}/ezpublish/instance.cfg (100%)
 rename software/{ => unstable}/ezpublish/software.cfg (100%)
 rename software/{ => unstable}/fengoffice/config-form.php.in (100%)
 rename software/{ => unstable}/fengoffice/software.cfg (100%)
 rename software/{ => unstable}/fluxbb/configure-fluxbb.py (100%)
 rename software/{ => unstable}/fluxbb/instance.cfg (100%)
 rename software/{ => unstable}/fluxbb/software.cfg (100%)
 rename software/{ => unstable}/fluxbb/template/config.inc.php.in (100%)
 rename software/{ => unstable}/freeglobes/configure-freeglobes.py (100%)
 rename software/{ => unstable}/freeglobes/instance.cfg (100%)
 rename software/{ => unstable}/freeglobes/software.cfg (100%)
 rename software/{ => unstable}/freewebshop/instance.cfg (100%)
 rename software/{ => unstable}/freewebshop/software.cfg (100%)
 rename software/{ => unstable}/frontaccounting/instance.cfg (100%)
 rename software/{ => unstable}/frontaccounting/software.cfg (100%)
 rename software/{ => unstable}/fusionnews/instance.cfg (100%)
 rename software/{ => unstable}/fusionnews/software.cfg (100%)
 rename software/{ => unstable}/galette/instance.cfg (100%)
 rename software/{ => unstable}/galette/software.cfg (100%)
 rename software/{ => unstable}/glpi/instance.cfg (100%)
 rename software/{ => unstable}/glpi/software.cfg (100%)
 rename software/{ => unstable}/guppy/instance.cfg (100%)
 rename software/{ => unstable}/guppy/software.cfg (100%)
 rename software/{ => unstable}/igalerie/instance.cfg (100%)
 rename software/{ => unstable}/igalerie/software.cfg (100%)
 rename software/{ => unstable}/joomla/database.xml-in (100%)
 rename software/{ => unstable}/joomla/instance.cfg (100%)
 rename software/{ => unstable}/joomla/software.cfg (100%)
 rename software/{ => unstable}/kubeblog/instance.cfg (100%)
 rename software/{ => unstable}/kubeblog/software.cfg (100%)
 rename software/{ => unstable}/lamp-generic/README.txt (100%)
 rename software/{ => unstable}/lamp-generic/development.cfg (100%)
 rename software/{ => unstable}/lamp-generic/instance-apache-php.cfg.in (100%)
 rename software/{ => unstable}/lamp-generic/instance-edge.cfg.in (100%)
 rename software/{ => unstable}/lamp-generic/instance.cfg.in (100%)
 rename software/{ => unstable}/lamp-generic/software.cfg (100%)
 rename software/{ => unstable}/lamp-template-static/instance.cfg (100%)
 rename software/{ => unstable}/lamp-template-static/software.cfg (100%)
 rename software/{ => unstable}/libcloud-requester/instance.cfg (100%)
 rename software/{ => unstable}/libcloud-requester/software.cfg (100%)
 rename software/{ => unstable}/libcloud/instance.cfg (100%)
 rename software/{ => unstable}/libcloud/software.cfg (100%)
 rename software/{ => unstable}/lifetype/instance.cfg (100%)
 rename software/{ => unstable}/lifetype/lifetype_for_mysql5.patch (100%)
 rename software/{ => unstable}/lifetype/software.cfg (100%)
 rename software/{ => unstable}/lxc/check_exists.sh.in (100%)
 rename software/{ => unstable}/lxc/check_state.sh.in (100%)
 rename software/{ => unstable}/lxc/instance-lxc.cfg (100%)
 rename software/{ => unstable}/lxc/instance.cfg (100%)
 rename software/{ => unstable}/lxc/lxc.conf.in (100%)
 rename software/{ => unstable}/lxc/rootfs.README (100%)
 rename software/{ => unstable}/lxc/software.cfg (100%)
 rename software/{ => unstable}/maarch/development.cfg (100%)
 rename software/{ => unstable}/maarch/instance-custom.cfg.in (100%)
 rename software/{ => unstable}/maarch/migration.txt (100%)
 rename software/{ => unstable}/maarch/software.cfg (100%)
 rename software/{ => unstable}/magento/instance.cfg (100%)
 rename software/{ => unstable}/magento/software.cfg (100%)
 rename software/{ => unstable}/mantis/instance.cfg (100%)
 rename software/{ => unstable}/mantis/software.cfg (100%)
 rename software/{ => unstable}/moodle/instance.cfg (100%)
 rename software/{ => unstable}/moodle/software.cfg (100%)
 rename software/{ => unstable}/moregroupware/instance.cfg (100%)
 rename software/{ => unstable}/moregroupware/software.cfg (100%)
 rename software/{ => unstable}/mybloggie/instance.cfg (100%)
 rename software/{ => unstable}/mybloggie/software.cfg (100%)
 rename software/{ => unstable}/mytinytodo/instance.cfg (100%)
 rename software/{ => unstable}/mytinytodo/software.cfg (100%)
 rename software/{ => unstable}/net2ftp/configure.py (100%)
 rename software/{ => unstable}/net2ftp/instance.cfg (100%)
 rename software/{ => unstable}/net2ftp/software.cfg (100%)
 rename software/{ => unstable}/net2ftp/template/net2ftp.inc.php.in (100%)
 rename software/{ => unstable}/newsevolution/instance.cfg (100%)
 rename software/{ => unstable}/newsevolution/software.cfg (100%)
 rename software/{ => unstable}/nosqltestbed/instance.cfg (100%)
 rename software/{ => unstable}/nosqltestbed/software.cfg (100%)
 rename software/{ => unstable}/nucleus/configure-nucleus.py (100%)
 rename software/{ => unstable}/nucleus/instance.cfg (100%)
 rename software/{ => unstable}/nucleus/software.cfg (100%)
 rename software/{ => unstable}/openX/instance.cfg (100%)
 rename software/{ => unstable}/openX/software.cfg (100%)
 rename software/{ => unstable}/openemr/configure-openemr.py (100%)
 rename software/{ => unstable}/openemr/instance.cfg (100%)
 rename software/{ => unstable}/openemr/software.cfg (100%)
 rename software/{ => unstable}/opengoo/config-form.php.in (100%)
 rename software/{ => unstable}/opengoo/software.cfg (100%)
 rename software/{ => unstable}/os-commerce/instance.cfg (100%)
 rename software/{ => unstable}/os-commerce/software.cfg (100%)
 rename software/{ => unstable}/ouapi/instance.cfg (100%)
 rename software/{ => unstable}/ouapi/software.cfg (100%)
 rename software/{ => unstable}/owncloud/instance.cfg (100%)
 rename software/{ => unstable}/owncloud/software.cfg (100%)
 rename software/{ => unstable}/phenix/instance.cfg (100%)
 rename software/{ => unstable}/phenix/software.cfg (100%)
 rename software/{ => unstable}/phpbb/instance.cfg (100%)
 rename software/{ => unstable}/phpbb/software.cfg (100%)
 rename software/{ => unstable}/phpbms/instance.cfg (100%)
 rename software/{ => unstable}/phpbms/phpbms_for_mysql5.patch (100%)
 rename software/{ => unstable}/phpbms/software.cfg (100%)
 rename software/{ => unstable}/phpbms/template/settings.php.in (100%)
 rename software/{ => unstable}/phpfin/configure-phpfin.py (100%)
 rename software/{ => unstable}/phpfin/instance.cfg (100%)
 rename software/{ => unstable}/phpfin/software.cfg (100%)
 rename software/{ => unstable}/phpfin/template/connection.inc.in (100%)
 rename software/{ => unstable}/phpip/instance.cfg (100%)
 rename software/{ => unstable}/phpip/software.cfg (100%)
 rename software/{ => unstable}/phpip/template/database.php.in (100%)
 rename software/{ => unstable}/phpmyadmin/instance.cfg (100%)
 rename software/{ => unstable}/phpmyadmin/phpmyadmin.inc.php.in (100%)
 rename software/{ => unstable}/phpmyadmin/software.cfg (100%)
 rename software/{ => unstable}/phpmybackup/instance.cfg (100%)
 rename software/{ => unstable}/phpmybackup/software.cfg (100%)
 rename software/{ => unstable}/phpmyfaq/instance.cfg (100%)
 rename software/{ => unstable}/phpmyfaq/software.cfg (100%)
 rename software/{ => unstable}/phpnuke/instance.cfg (100%)
 rename software/{ => unstable}/phpnuke/software.cfg (100%)
 rename software/{ => unstable}/phpnuke/template/phpnuke.inc.php.in (100%)
 rename software/{ => unstable}/phprojekt/instance.cfg (100%)
 rename software/{ => unstable}/phprojekt/software.cfg (100%)
 rename software/{ => unstable}/pimcore/instance.cfg (100%)
 rename software/{ => unstable}/pimcore/software.cfg (100%)
 rename software/{ => unstable}/piwigo/instance.cfg (100%)
 rename software/{ => unstable}/piwigo/software.cfg (100%)
 rename software/{ => unstable}/piwigo/template/piwigo.inc.php.in (100%)
 rename software/{ => unstable}/piwik/instance.cfg (100%)
 rename software/{ => unstable}/piwik/software.cfg (100%)
 rename software/{ => unstable}/pixelpost/instance.cfg (100%)
 rename software/{ => unstable}/pixelpost/pixelpost_for_mysql5.patch (100%)
 rename software/{ => unstable}/pixelpost/software.cfg (100%)
 rename software/{ => unstable}/prestashop/instance.cfg (100%)
 rename software/{ => unstable}/prestashop/software.cfg (100%)
 rename software/{ => unstable}/proactive/instance.cfg (100%)
 rename software/{ => unstable}/proactive/software.cfg (100%)
 rename software/{ => unstable}/projelead/instance.cfg (100%)
 rename software/{ => unstable}/projelead/software.cfg (100%)
 rename software/{ => unstable}/pulse/instance.cfg (100%)
 rename software/{ => unstable}/pulse/software.cfg (100%)
 rename software/{ => unstable}/punbb/instance.cfg (100%)
 rename software/{ => unstable}/punbb/software.cfg (100%)
 rename software/{ => unstable}/punbb/template/punbb.inc.php.in (100%)
 rename software/{ => unstable}/quick-cart/instance.cfg (100%)
 rename software/{ => unstable}/quick-cart/software.cfg (100%)
 rename software/{ => unstable}/quick-cms/instance.cfg (100%)
 rename software/{ => unstable}/quick-cms/software.cfg (100%)
 rename software/{ => unstable}/reverse-proxy-nginx/common.cfg (100%)
 rename software/{ => unstable}/reverse-proxy-nginx/development.cfg (100%)
 rename software/{ => unstable}/reverse-proxy-nginx/instance.cfg.in (100%)
 rename software/{ => unstable}/sheepdogtestbed/instance.cfg (100%)
 rename software/{ => unstable}/sheepdogtestbed/software.cfg (100%)
 rename software/{ => unstable}/silverstripe/instance.cfg (100%)
 rename software/{ => unstable}/silverstripe/software.cfg (100%)
 rename software/{ => unstable}/simple-invoicing/instance.cfg (100%)
 rename software/{ => unstable}/simple-invoicing/software.cfg (100%)
 rename software/{ => unstable}/simpleMachineForum/instance.cfg (100%)
 rename software/{ => unstable}/simpleMachineForum/software.cfg (100%)
 rename software/{ => unstable}/spip/instance.cfg (100%)
 rename software/{ => unstable}/spip/software.cfg (100%)
 rename software/{ => unstable}/statusnet/instance.cfg (100%)
 rename software/{ => unstable}/statusnet/software.cfg (100%)
 rename software/{ => unstable}/sugar-crm/instance.cfg (100%)
 rename software/{ => unstable}/sugar-crm/software.cfg (100%)
 rename software/{ => unstable}/thelia/instance.cfg (100%)
 rename software/{ => unstable}/thelia/software.cfg (100%)
 rename software/{ => unstable}/tiki/instance.cfg (100%)
 rename software/{ => unstable}/tiki/software.cfg (100%)
 rename software/{ => unstable}/tt-rss/development.cfg (100%)
 rename software/{ => unstable}/tt-rss/instance-custom.cfg.in (100%)
 rename software/{ => unstable}/tt-rss/script/tt-rss.sql (100%)
 rename software/{ => unstable}/tt-rss/software.cfg (100%)
 rename software/{ => unstable}/tt-rss/template/config.php.in (100%)
 rename software/{ => unstable}/ultimate-php-borad/instance.cfg (100%)
 rename software/{ => unstable}/ultimate-php-borad/software.cfg (100%)
 rename software/{ => unstable}/vifib/software.cfg (100%)
 rename software/{ => unstable}/web2project/instance.cfg (100%)
 rename software/{ => unstable}/web2project/software.cfg (100%)
 rename software/{ => unstable}/wikyblog/instance.cfg (100%)
 rename software/{ => unstable}/wikyblog/software.cfg (100%)
 rename software/{ => unstable}/xaraya/instance.cfg (100%)
 rename software/{ => unstable}/xaraya/software.cfg (100%)
 rename software/{ => unstable}/xellplan/instance.cfg (100%)
 rename software/{ => unstable}/xellplan/software.cfg (100%)
 rename software/{ => unstable}/xellplan/template/sfx.php.in (100%)
 rename software/{ => unstable}/xoops/instance.cfg (100%)
 rename software/{ => unstable}/xoops/software.cfg (100%)
 rename software/{ => unstable}/xwiki/instance.cfg (100%)
 rename software/{ => unstable}/xwiki/software.cfg (100%)
 rename software/{ => unstable}/zencart/configure.py (100%)
 rename software/{ => unstable}/zencart/instance.cfg (100%)
 rename software/{ => unstable}/zencart/software.cfg (100%)
 rename software/{ => unstable}/zenphoto/instance.cfg (100%)
 rename software/{ => unstable}/zenphoto/software.cfg (100%)
 rename software/{ => unstable}/zikula/configure-zikula.py (100%)
 rename software/{ => unstable}/zikula/instance.cfg (100%)
 rename software/{ => unstable}/zikula/software.cfg (100%)
 rename software/{ => unstable}/zimbra-kvm/README.txt (100%)
 rename software/{ => unstable}/zimbra-kvm/common.cfg (100%)
 rename software/{ => unstable}/zimbra-kvm/development.cfg (100%)
 rename software/{ => unstable}/zimbra-kvm/instance-kvm.cfg.in (100%)
 rename software/{ => unstable}/zimbra-kvm/instance.cfg.in (100%)
 rename software/{ => unstable}/zimbra-kvm/software.cfg (100%)

diff --git a/software/erp5-util-testing/instance.cfg b/software/erp5-util-testing/instance.cfg
deleted file mode 100644
index 0ec4483ec..000000000
--- a/software/erp5-util-testing/instance.cfg
+++ /dev/null
@@ -1,62 +0,0 @@
-[buildout]
-parts =
-  erp5-util-setup
-  test-runner
-  sh-environment
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[create-directory]
-recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-etc = $${buildout:directory}/etc
-services = $${:etc}/run
-srv = $${buildout:directory}/srv
-source-code = $${:srv}/eggs-source-code
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[erp5-util]
-<= download-source
-repository = ${erp5-util-repository:location}
-
-[erp5-util-setup]
-recipe = plone.recipe.command
-command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
-update-command = $${:command}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${create-directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-# The list of executables should be defined here and a combination
-# of tests should dynamically generated.
-#python-list = $${}
-test-list =
-  $${erp5-util:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
-PYTHONPATH = ${buildout:eggs-directory}/setuptools-${versions:setuptools}-py2.7.egg
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib
-
-[sh-environment]
-# Section exposes testing default environment as sh file. It is thus easy
-# to directly develop and test the egg inside of this instance.
-recipe = collective.recipe.template
-input = inline:
-  export PATH="$${test-runner:prepend-path}:$PATH"
-  export CPPFLAGS="$${environment:CPPFLAGS}"
-  export LDFLAGS="$${environment:LDFLAGS}"
-  export PYTHONPATH="$${environment:PYTHONPATH}"
-  export PS1="[slapos-testing env Active] $PS1"
-output = $${create-directory:bin}/environment.sh
-mode = 755
diff --git a/software/jio/instance.cfg.in b/software/jio/instance.cfg.in
deleted file mode 100644
index 235172dc0..000000000
--- a/software/jio/instance.cfg.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################
-#
-# Deploy jio instance
-#
-#############################
-[buildout]
-parts =
-  test-runner
-  phantomjs-wrapper
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-# Create all needed directories, depending on your needs
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin/
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[jio]
-<= download-source
-repository = ${jio-repository:location}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-test-list =
-  $${jio:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
-PYTHONPATH = ${python-setuptools:pythonpath}
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
-
-[phantomjs-wrapper]
-recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/phantomjs-slapos
-wrapper-path = $${directory:bin}/phantomjs
-# XXX we must use "parameters-extra" (- instead of _)
-# when new slapos.cookbook will be used
-parameters_extra = true
diff --git a/software/officejs/instance.cfg.in b/software/officejs/instance.cfg.in
deleted file mode 100644
index 37345f0ef..000000000
--- a/software/officejs/instance.cfg.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################
-#
-# Deploy officejs instance
-#
-#############################
-[buildout]
-parts =
-  test-runner
-  phantomjs-wrapper
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-# Create all needed directories, depending on your needs
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin/
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[officejs]
-<= download-source
-repository = ${officejs-repository:location}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-test-list =
-  $${officejs:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
-PYTHONPATH = ${python-setuptools:location}
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
-
-[phantomjs-wrapper]
-recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/phantomjs-slapos
-wrapper-path = $${directory:bin}/phantomjs
-# XXX we must use "parameters-extra" (- instead of _)
-# when new slapos.cookbook will be used
-parameters_extra = true
diff --git a/software/slaprunner-lite/README.txt b/software/slaprunner-lite/README.txt
deleted file mode 100644
index 112c4fd3a..000000000
--- a/software/slaprunner-lite/README.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-slaprunner
-==========
-
-Introduction
-------------
-
-This software release is used to deploy Slaprunner instances.
-Slaprunner is an all-in-one IDE used to develop and test profiles and recipes for SlapOS.
-
-Parameters
-----------
-
-authorized-key
-~~~~~~~~~~~~~~
-
-You need to specify your SSH public key in order to connect to the SSH server of this instance.
-
-Example of parameter XML::
-
-  <?xml version="1.0" encoding="utf-8"?>
-  <instance>
-  <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
-  </instance>
-
-instance-amount
-~~~~~~~~~~~~~~~
-
-Optional parameter.
-
-Default: 10
diff --git a/software/slaprunner-lite/common.cfg b/software/slaprunner-lite/common.cfg
deleted file mode 100644
index fd3448beb..000000000
--- a/software/slaprunner-lite/common.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-[buildout]
-extends =
-  ../../component/dash/buildout.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../stack/flask.cfg
-  ../../stack/shacache-client.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  template
-  slapos-cookbook
-  eggs
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-md5sum = 5307e4200f044ae57b504ad68444491c
-
-[template-runner]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-runner.cfg
-output = ${buildout:directory}/template-runner.cfg
-md5sum = 4861be4a581686feef9f9edea865d7ee
-mode = 0644
-
-[eggs]
-recipe = z3c.recipe.scripts
-eggs =
-  ${lxml-python:egg}
-  slapos.libnetworkcache
-  slapos.toolbox[flask_auth]
-  slapos.core
-  cns.recipe.symlink
diff --git a/software/slaprunner-lite/development.cfg b/software/slaprunner-lite/development.cfg
deleted file mode 100644
index 21f0da315..000000000
--- a/software/slaprunner-lite/development.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# Development profile of slaprunner.
-# Exactly the same as software.cfg, but fetch the slapos.cookbook and
-# slapos.toolbox from git repository instead of fetching stable version,
-# allowing to play with bleeding edge environment.
-
-# You'll need to run buildout twice for this profile.
-
-[buildout]
-extends = common.cfg
-
-parts +=
-  slapos.cookbook-repository
-  slapos.core-repository
-  slapos.toolbox-repository
-  check-recipe
-
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/slapos.core-repository
-  ${:parts-directory}/slapos.toolbox-repository
-
-
-[slapos.toolbox-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
-branch = slaprunner
-git-executable = ${git:location}/bin/git
-
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
-branch = slaprunner
-git-executable = ${git:location}/bin/git
-
-[slapos.core-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command =
-  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
diff --git a/software/slaprunner-lite/instance-runner.cfg b/software/slaprunner-lite/instance-runner.cfg
deleted file mode 100644
index 3080a778c..000000000
--- a/software/slaprunner-lite/instance-runner.cfg
+++ /dev/null
@@ -1,190 +0,0 @@
-[buildout]
-parts =
-  slaprunner
-  test-runner
-  sshkeys-dropbear
-  dropbear-server-add-authorized-key
-  sshkeys-authority
-  publish-connection-informations
-  slaprunner-promise
-  slaprunner-frontend-promise
-  dropbear-promise
-  symlinks
-
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-
-# Create all needed directories
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-
-sshkeys = $${:srv}/sshkeys
-services = $${:etc}/service/
-scripts = $${:etc}/run/
-ssh = $${:etc}/ssh/
-log = $${:var}/log/
-run = $${:var}/run/
-backup = $${:srv}/backup/
-promises = $${:etc}/promise/
-test = $${:etc}/test/
-
-[runnerdirectory]
-recipe = slapos.cookbook:mkdirectory
-home = $${directory:srv}/runner/
-test = $${directory:srv}/test/
-project = $${:home}/project
-software-root = $${:home}/software
-instance-root = $${:home}/instance
-project-test = $${:test}/project
-software-test = $${:test}/software
-instance-test = $${:test}/instance
-sessions = $${buildout:directory}/.sessions
-
-#Create password recovery code for slaprunner
-[recovery-code]
-recipe = slapos.cookbook:generate.password
-storage-path = $${directory:etc}/.rcode
-bytes = 4
-
-[slaprunner]
-recipe = slapos.cookbook:slaprunner
-slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
-slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
-git-binary = ${git:location}/bin/git
-slapos.cfg = $${directory:etc}/slapos.cfg
-working-directory = $${runnerdirectory:home}
-project-directory = $${runnerdirectory:project}
-software-directory = $${runnerdirectory:software-root}
-instance-directory = $${runnerdirectory:instance-root}
-etc_dir = $${directory:etc}
-log_dir =  $${directory:log}
-run_dir = $${directory:run}
-ssh_client = $${sshkeys-dropbear:wrapper}
-public_key = $${sshkeys-dropbear:public-key}
-private_key = $${sshkeys-dropbear:private-key}
-ipv4 = $${slap-network-information:local-ipv4}
-ipv6 = $${slap-network-information:global-ipv6}
-proxy_port = 50000
-runner_port = 50000
-partition-amount = $${slap-parameter:instance-amount}
-wrapper = $${directory:services}/slaprunner
-debug = $${slap-parameter:debug}
-# Backward compatiblity
-cloud9-url =
-
-[test-runner]
-<= slaprunner
-recipe = slapos.cookbook:slaprunner.test
-slaprunnertest = ${buildout:directory}/bin/slaprunnertest
-slapos.cfg = $${directory:etc}/slapos-test.cfg
-working-directory = $${runnerdirectory:test}
-project-directory = $${runnerdirectory:project-test}
-software-directory = $${runnerdirectory:software-test}
-instance-directory = $${runnerdirectory:instance-test}
-proxy_port = 8602
-wrapper = $${directory:bin}/runTestSuite
-etc_dir = $${directory:test}
-
-
-# Deploy dropbear (minimalist SSH server)
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests/
-keys = $${directory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${directory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${directory:bin}/raw_sshd
-shell = /bin/bash
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${directory:services}/sshd
-
-[dropbear-server-add-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-
-# Request frontend
-[request-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Frontend
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config = url
-config-url = $${slaprunner:access-url}
-return = site_url
-
-
-# Send informations to SlapOS Master
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-backend_url = $${slaprunner:access-url}
-url =  $${request-frontend:connection-site_url}
-ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
-password_recovery_code = $${recovery-code:passwd}
-
-
-# Deploy promises scripts
-[slaprunner-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/slaprunner
-hostname = $${slaprunner:ipv6}
-port = $${slaprunner:runner_port}
-
-[slaprunner-frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promises}/slaprunner_frontend
-url = $${request-frontend:connection-site_url}
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[dropbear-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/dropbear
-hostname = $${dropbear-server:host}
-port = $${dropbear-server:port}
-
-[symlinks]
-recipe = cns.recipe.symlink
-symlink_target = $${directory:bin}
-symlink_base = ${buildout:directory}/bin
-
-[slap-parameter]
-# Default value if no ssh key is specified
-authorized-key =
-# Default value of instances number in slaprunner
-instance-amount = 10
-debug = false
diff --git a/software/slaprunner-lite/instance.cfg b/software/slaprunner-lite/instance.cfg
deleted file mode 100644
index 446a7a198..000000000
--- a/software/slaprunner-lite/instance.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-[buildout]
-parts =
-  switch_softwaretype
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[switch_softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-runner:output}
\ No newline at end of file
diff --git a/software/MediaWiki/instance.cfg b/software/unstable/MediaWiki/instance.cfg
similarity index 100%
rename from software/MediaWiki/instance.cfg
rename to software/unstable/MediaWiki/instance.cfg
diff --git a/software/MediaWiki/patch/mediawiki-1.17.0.config.patch b/software/unstable/MediaWiki/patch/mediawiki-1.17.0.config.patch
similarity index 100%
rename from software/MediaWiki/patch/mediawiki-1.17.0.config.patch
rename to software/unstable/MediaWiki/patch/mediawiki-1.17.0.config.patch
diff --git a/software/MediaWiki/software.cfg b/software/unstable/MediaWiki/software.cfg
similarity index 100%
rename from software/MediaWiki/software.cfg
rename to software/unstable/MediaWiki/software.cfg
diff --git a/software/agora/instance.cfg b/software/unstable/agora/instance.cfg
similarity index 100%
rename from software/agora/instance.cfg
rename to software/unstable/agora/instance.cfg
diff --git a/software/agora/software.cfg b/software/unstable/agora/software.cfg
similarity index 100%
rename from software/agora/software.cfg
rename to software/unstable/agora/software.cfg
diff --git a/software/arfooo/instance.cfg b/software/unstable/arfooo/instance.cfg
similarity index 100%
rename from software/arfooo/instance.cfg
rename to software/unstable/arfooo/instance.cfg
diff --git a/software/arfooo/software.cfg b/software/unstable/arfooo/software.cfg
similarity index 100%
rename from software/arfooo/software.cfg
rename to software/unstable/arfooo/software.cfg
diff --git a/software/b2evolution/instance.cfg b/software/unstable/b2evolution/instance.cfg
similarity index 100%
rename from software/b2evolution/instance.cfg
rename to software/unstable/b2evolution/instance.cfg
diff --git a/software/b2evolution/software.cfg b/software/unstable/b2evolution/software.cfg
similarity index 100%
rename from software/b2evolution/software.cfg
rename to software/unstable/b2evolution/software.cfg
diff --git a/software/chamilo/instance.cfg b/software/unstable/chamilo/instance.cfg
similarity index 100%
rename from software/chamilo/instance.cfg
rename to software/unstable/chamilo/instance.cfg
diff --git a/software/chamilo/software.cfg b/software/unstable/chamilo/software.cfg
similarity index 100%
rename from software/chamilo/software.cfg
rename to software/unstable/chamilo/software.cfg
diff --git a/software/claroline/instance.cfg b/software/unstable/claroline/instance.cfg
similarity index 100%
rename from software/claroline/instance.cfg
rename to software/unstable/claroline/instance.cfg
diff --git a/software/claroline/software.cfg b/software/unstable/claroline/software.cfg
similarity index 100%
rename from software/claroline/software.cfg
rename to software/unstable/claroline/software.cfg
diff --git a/software/cmsmadesimple/instance.cfg b/software/unstable/cmsmadesimple/instance.cfg
similarity index 100%
rename from software/cmsmadesimple/instance.cfg
rename to software/unstable/cmsmadesimple/instance.cfg
diff --git a/software/cmsmadesimple/software.cfg b/software/unstable/cmsmadesimple/software.cfg
similarity index 100%
rename from software/cmsmadesimple/software.cfg
rename to software/unstable/cmsmadesimple/software.cfg
diff --git a/software/condor/instance-condor.cfg b/software/unstable/condor/instance-condor.cfg
similarity index 100%
rename from software/condor/instance-condor.cfg
rename to software/unstable/condor/instance-condor.cfg
diff --git a/software/condor/instance.cfg b/software/unstable/condor/instance.cfg
similarity index 100%
rename from software/condor/instance.cfg
rename to software/unstable/condor/instance.cfg
diff --git a/software/condor/software.cfg b/software/unstable/condor/software.cfg
similarity index 100%
rename from software/condor/software.cfg
rename to software/unstable/condor/software.cfg
diff --git a/software/condor/template/simple b/software/unstable/condor/template/simple
similarity index 100%
rename from software/condor/template/simple
rename to software/unstable/condor/template/simple
diff --git a/software/condor/template/submit b/software/unstable/condor/template/submit
similarity index 100%
rename from software/condor/template/submit
rename to software/unstable/condor/template/submit
diff --git a/software/coppermine/instance.cfg b/software/unstable/coppermine/instance.cfg
similarity index 100%
rename from software/coppermine/instance.cfg
rename to software/unstable/coppermine/instance.cfg
diff --git a/software/coppermine/software.cfg b/software/unstable/coppermine/software.cfg
similarity index 100%
rename from software/coppermine/software.cfg
rename to software/unstable/coppermine/software.cfg
diff --git a/software/coppermine/template/coppermine.inc.php.in b/software/unstable/coppermine/template/coppermine.inc.php.in
similarity index 100%
rename from software/coppermine/template/coppermine.inc.php.in
rename to software/unstable/coppermine/template/coppermine.inc.php.in
diff --git a/software/dokuwiki/mysql.conf.php.in b/software/unstable/dokuwiki/mysql.conf.php.in
similarity index 100%
rename from software/dokuwiki/mysql.conf.php.in
rename to software/unstable/dokuwiki/mysql.conf.php.in
diff --git a/software/dokuwiki/software.cfg b/software/unstable/dokuwiki/software.cfg
similarity index 100%
rename from software/dokuwiki/software.cfg
rename to software/unstable/dokuwiki/software.cfg
diff --git a/software/dotclear/instance.cfg b/software/unstable/dotclear/instance.cfg
similarity index 100%
rename from software/dotclear/instance.cfg
rename to software/unstable/dotclear/instance.cfg
diff --git a/software/dotclear/software.cfg b/software/unstable/dotclear/software.cfg
similarity index 100%
rename from software/dotclear/software.cfg
rename to software/unstable/dotclear/software.cfg
diff --git a/software/dotclear/template/dotclear.inc.php.in b/software/unstable/dotclear/template/dotclear.inc.php.in
similarity index 100%
rename from software/dotclear/template/dotclear.inc.php.in
rename to software/unstable/dotclear/template/dotclear.inc.php.in
diff --git a/software/dotproject/instance.cfg b/software/unstable/dotproject/instance.cfg
similarity index 100%
rename from software/dotproject/instance.cfg
rename to software/unstable/dotproject/instance.cfg
diff --git a/software/dotproject/software.cfg b/software/unstable/dotproject/software.cfg
similarity index 100%
rename from software/dotproject/software.cfg
rename to software/unstable/dotproject/software.cfg
diff --git a/software/dotproject/template/config.inc.php.in b/software/unstable/dotproject/template/config.inc.php.in
similarity index 100%
rename from software/dotproject/template/config.inc.php.in
rename to software/unstable/dotproject/template/config.inc.php.in
diff --git a/software/drupal/settings.php.in b/software/unstable/drupal/settings.php.in
similarity index 100%
rename from software/drupal/settings.php.in
rename to software/unstable/drupal/settings.php.in
diff --git a/software/drupal/software.cfg b/software/unstable/drupal/software.cfg
similarity index 100%
rename from software/drupal/software.cfg
rename to software/unstable/drupal/software.cfg
diff --git a/software/drupal/system.theme.css.patch b/software/unstable/drupal/system.theme.css.patch
similarity index 100%
rename from software/drupal/system.theme.css.patch
rename to software/unstable/drupal/system.theme.css.patch
diff --git a/software/eSKUeL/instance.cfg b/software/unstable/eSKUeL/instance.cfg
similarity index 100%
rename from software/eSKUeL/instance.cfg
rename to software/unstable/eSKUeL/instance.cfg
diff --git a/software/eSKUeL/software.cfg b/software/unstable/eSKUeL/software.cfg
similarity index 100%
rename from software/eSKUeL/software.cfg
rename to software/unstable/eSKUeL/software.cfg
diff --git a/software/ezpublish/instance.cfg b/software/unstable/ezpublish/instance.cfg
similarity index 100%
rename from software/ezpublish/instance.cfg
rename to software/unstable/ezpublish/instance.cfg
diff --git a/software/ezpublish/software.cfg b/software/unstable/ezpublish/software.cfg
similarity index 100%
rename from software/ezpublish/software.cfg
rename to software/unstable/ezpublish/software.cfg
diff --git a/software/fengoffice/config-form.php.in b/software/unstable/fengoffice/config-form.php.in
similarity index 100%
rename from software/fengoffice/config-form.php.in
rename to software/unstable/fengoffice/config-form.php.in
diff --git a/software/fengoffice/software.cfg b/software/unstable/fengoffice/software.cfg
similarity index 100%
rename from software/fengoffice/software.cfg
rename to software/unstable/fengoffice/software.cfg
diff --git a/software/fluxbb/configure-fluxbb.py b/software/unstable/fluxbb/configure-fluxbb.py
similarity index 100%
rename from software/fluxbb/configure-fluxbb.py
rename to software/unstable/fluxbb/configure-fluxbb.py
diff --git a/software/fluxbb/instance.cfg b/software/unstable/fluxbb/instance.cfg
similarity index 100%
rename from software/fluxbb/instance.cfg
rename to software/unstable/fluxbb/instance.cfg
diff --git a/software/fluxbb/software.cfg b/software/unstable/fluxbb/software.cfg
similarity index 100%
rename from software/fluxbb/software.cfg
rename to software/unstable/fluxbb/software.cfg
diff --git a/software/fluxbb/template/config.inc.php.in b/software/unstable/fluxbb/template/config.inc.php.in
similarity index 100%
rename from software/fluxbb/template/config.inc.php.in
rename to software/unstable/fluxbb/template/config.inc.php.in
diff --git a/software/freeglobes/configure-freeglobes.py b/software/unstable/freeglobes/configure-freeglobes.py
similarity index 100%
rename from software/freeglobes/configure-freeglobes.py
rename to software/unstable/freeglobes/configure-freeglobes.py
diff --git a/software/freeglobes/instance.cfg b/software/unstable/freeglobes/instance.cfg
similarity index 100%
rename from software/freeglobes/instance.cfg
rename to software/unstable/freeglobes/instance.cfg
diff --git a/software/freeglobes/software.cfg b/software/unstable/freeglobes/software.cfg
similarity index 100%
rename from software/freeglobes/software.cfg
rename to software/unstable/freeglobes/software.cfg
diff --git a/software/freewebshop/instance.cfg b/software/unstable/freewebshop/instance.cfg
similarity index 100%
rename from software/freewebshop/instance.cfg
rename to software/unstable/freewebshop/instance.cfg
diff --git a/software/freewebshop/software.cfg b/software/unstable/freewebshop/software.cfg
similarity index 100%
rename from software/freewebshop/software.cfg
rename to software/unstable/freewebshop/software.cfg
diff --git a/software/frontaccounting/instance.cfg b/software/unstable/frontaccounting/instance.cfg
similarity index 100%
rename from software/frontaccounting/instance.cfg
rename to software/unstable/frontaccounting/instance.cfg
diff --git a/software/frontaccounting/software.cfg b/software/unstable/frontaccounting/software.cfg
similarity index 100%
rename from software/frontaccounting/software.cfg
rename to software/unstable/frontaccounting/software.cfg
diff --git a/software/fusionnews/instance.cfg b/software/unstable/fusionnews/instance.cfg
similarity index 100%
rename from software/fusionnews/instance.cfg
rename to software/unstable/fusionnews/instance.cfg
diff --git a/software/fusionnews/software.cfg b/software/unstable/fusionnews/software.cfg
similarity index 100%
rename from software/fusionnews/software.cfg
rename to software/unstable/fusionnews/software.cfg
diff --git a/software/galette/instance.cfg b/software/unstable/galette/instance.cfg
similarity index 100%
rename from software/galette/instance.cfg
rename to software/unstable/galette/instance.cfg
diff --git a/software/galette/software.cfg b/software/unstable/galette/software.cfg
similarity index 100%
rename from software/galette/software.cfg
rename to software/unstable/galette/software.cfg
diff --git a/software/glpi/instance.cfg b/software/unstable/glpi/instance.cfg
similarity index 100%
rename from software/glpi/instance.cfg
rename to software/unstable/glpi/instance.cfg
diff --git a/software/glpi/software.cfg b/software/unstable/glpi/software.cfg
similarity index 100%
rename from software/glpi/software.cfg
rename to software/unstable/glpi/software.cfg
diff --git a/software/guppy/instance.cfg b/software/unstable/guppy/instance.cfg
similarity index 100%
rename from software/guppy/instance.cfg
rename to software/unstable/guppy/instance.cfg
diff --git a/software/guppy/software.cfg b/software/unstable/guppy/software.cfg
similarity index 100%
rename from software/guppy/software.cfg
rename to software/unstable/guppy/software.cfg
diff --git a/software/igalerie/instance.cfg b/software/unstable/igalerie/instance.cfg
similarity index 100%
rename from software/igalerie/instance.cfg
rename to software/unstable/igalerie/instance.cfg
diff --git a/software/igalerie/software.cfg b/software/unstable/igalerie/software.cfg
similarity index 100%
rename from software/igalerie/software.cfg
rename to software/unstable/igalerie/software.cfg
diff --git a/software/joomla/database.xml-in b/software/unstable/joomla/database.xml-in
similarity index 100%
rename from software/joomla/database.xml-in
rename to software/unstable/joomla/database.xml-in
diff --git a/software/joomla/instance.cfg b/software/unstable/joomla/instance.cfg
similarity index 100%
rename from software/joomla/instance.cfg
rename to software/unstable/joomla/instance.cfg
diff --git a/software/joomla/software.cfg b/software/unstable/joomla/software.cfg
similarity index 100%
rename from software/joomla/software.cfg
rename to software/unstable/joomla/software.cfg
diff --git a/software/kubeblog/instance.cfg b/software/unstable/kubeblog/instance.cfg
similarity index 100%
rename from software/kubeblog/instance.cfg
rename to software/unstable/kubeblog/instance.cfg
diff --git a/software/kubeblog/software.cfg b/software/unstable/kubeblog/software.cfg
similarity index 100%
rename from software/kubeblog/software.cfg
rename to software/unstable/kubeblog/software.cfg
diff --git a/software/lamp-generic/README.txt b/software/unstable/lamp-generic/README.txt
similarity index 100%
rename from software/lamp-generic/README.txt
rename to software/unstable/lamp-generic/README.txt
diff --git a/software/lamp-generic/development.cfg b/software/unstable/lamp-generic/development.cfg
similarity index 100%
rename from software/lamp-generic/development.cfg
rename to software/unstable/lamp-generic/development.cfg
diff --git a/software/lamp-generic/instance-apache-php.cfg.in b/software/unstable/lamp-generic/instance-apache-php.cfg.in
similarity index 100%
rename from software/lamp-generic/instance-apache-php.cfg.in
rename to software/unstable/lamp-generic/instance-apache-php.cfg.in
diff --git a/software/lamp-generic/instance-edge.cfg.in b/software/unstable/lamp-generic/instance-edge.cfg.in
similarity index 100%
rename from software/lamp-generic/instance-edge.cfg.in
rename to software/unstable/lamp-generic/instance-edge.cfg.in
diff --git a/software/lamp-generic/instance.cfg.in b/software/unstable/lamp-generic/instance.cfg.in
similarity index 100%
rename from software/lamp-generic/instance.cfg.in
rename to software/unstable/lamp-generic/instance.cfg.in
diff --git a/software/lamp-generic/software.cfg b/software/unstable/lamp-generic/software.cfg
similarity index 100%
rename from software/lamp-generic/software.cfg
rename to software/unstable/lamp-generic/software.cfg
diff --git a/software/lamp-template-static/instance.cfg b/software/unstable/lamp-template-static/instance.cfg
similarity index 100%
rename from software/lamp-template-static/instance.cfg
rename to software/unstable/lamp-template-static/instance.cfg
diff --git a/software/lamp-template-static/software.cfg b/software/unstable/lamp-template-static/software.cfg
similarity index 100%
rename from software/lamp-template-static/software.cfg
rename to software/unstable/lamp-template-static/software.cfg
diff --git a/software/libcloud-requester/instance.cfg b/software/unstable/libcloud-requester/instance.cfg
similarity index 100%
rename from software/libcloud-requester/instance.cfg
rename to software/unstable/libcloud-requester/instance.cfg
diff --git a/software/libcloud-requester/software.cfg b/software/unstable/libcloud-requester/software.cfg
similarity index 100%
rename from software/libcloud-requester/software.cfg
rename to software/unstable/libcloud-requester/software.cfg
diff --git a/software/libcloud/instance.cfg b/software/unstable/libcloud/instance.cfg
similarity index 100%
rename from software/libcloud/instance.cfg
rename to software/unstable/libcloud/instance.cfg
diff --git a/software/libcloud/software.cfg b/software/unstable/libcloud/software.cfg
similarity index 100%
rename from software/libcloud/software.cfg
rename to software/unstable/libcloud/software.cfg
diff --git a/software/lifetype/instance.cfg b/software/unstable/lifetype/instance.cfg
similarity index 100%
rename from software/lifetype/instance.cfg
rename to software/unstable/lifetype/instance.cfg
diff --git a/software/lifetype/lifetype_for_mysql5.patch b/software/unstable/lifetype/lifetype_for_mysql5.patch
similarity index 100%
rename from software/lifetype/lifetype_for_mysql5.patch
rename to software/unstable/lifetype/lifetype_for_mysql5.patch
diff --git a/software/lifetype/software.cfg b/software/unstable/lifetype/software.cfg
similarity index 100%
rename from software/lifetype/software.cfg
rename to software/unstable/lifetype/software.cfg
diff --git a/software/lxc/check_exists.sh.in b/software/unstable/lxc/check_exists.sh.in
similarity index 100%
rename from software/lxc/check_exists.sh.in
rename to software/unstable/lxc/check_exists.sh.in
diff --git a/software/lxc/check_state.sh.in b/software/unstable/lxc/check_state.sh.in
similarity index 100%
rename from software/lxc/check_state.sh.in
rename to software/unstable/lxc/check_state.sh.in
diff --git a/software/lxc/instance-lxc.cfg b/software/unstable/lxc/instance-lxc.cfg
similarity index 100%
rename from software/lxc/instance-lxc.cfg
rename to software/unstable/lxc/instance-lxc.cfg
diff --git a/software/lxc/instance.cfg b/software/unstable/lxc/instance.cfg
similarity index 100%
rename from software/lxc/instance.cfg
rename to software/unstable/lxc/instance.cfg
diff --git a/software/lxc/lxc.conf.in b/software/unstable/lxc/lxc.conf.in
similarity index 100%
rename from software/lxc/lxc.conf.in
rename to software/unstable/lxc/lxc.conf.in
diff --git a/software/lxc/rootfs.README b/software/unstable/lxc/rootfs.README
similarity index 100%
rename from software/lxc/rootfs.README
rename to software/unstable/lxc/rootfs.README
diff --git a/software/lxc/software.cfg b/software/unstable/lxc/software.cfg
similarity index 100%
rename from software/lxc/software.cfg
rename to software/unstable/lxc/software.cfg
diff --git a/software/maarch/development.cfg b/software/unstable/maarch/development.cfg
similarity index 100%
rename from software/maarch/development.cfg
rename to software/unstable/maarch/development.cfg
diff --git a/software/maarch/instance-custom.cfg.in b/software/unstable/maarch/instance-custom.cfg.in
similarity index 100%
rename from software/maarch/instance-custom.cfg.in
rename to software/unstable/maarch/instance-custom.cfg.in
diff --git a/software/maarch/migration.txt b/software/unstable/maarch/migration.txt
similarity index 100%
rename from software/maarch/migration.txt
rename to software/unstable/maarch/migration.txt
diff --git a/software/maarch/software.cfg b/software/unstable/maarch/software.cfg
similarity index 100%
rename from software/maarch/software.cfg
rename to software/unstable/maarch/software.cfg
diff --git a/software/magento/instance.cfg b/software/unstable/magento/instance.cfg
similarity index 100%
rename from software/magento/instance.cfg
rename to software/unstable/magento/instance.cfg
diff --git a/software/magento/software.cfg b/software/unstable/magento/software.cfg
similarity index 100%
rename from software/magento/software.cfg
rename to software/unstable/magento/software.cfg
diff --git a/software/mantis/instance.cfg b/software/unstable/mantis/instance.cfg
similarity index 100%
rename from software/mantis/instance.cfg
rename to software/unstable/mantis/instance.cfg
diff --git a/software/mantis/software.cfg b/software/unstable/mantis/software.cfg
similarity index 100%
rename from software/mantis/software.cfg
rename to software/unstable/mantis/software.cfg
diff --git a/software/moodle/instance.cfg b/software/unstable/moodle/instance.cfg
similarity index 100%
rename from software/moodle/instance.cfg
rename to software/unstable/moodle/instance.cfg
diff --git a/software/moodle/software.cfg b/software/unstable/moodle/software.cfg
similarity index 100%
rename from software/moodle/software.cfg
rename to software/unstable/moodle/software.cfg
diff --git a/software/moregroupware/instance.cfg b/software/unstable/moregroupware/instance.cfg
similarity index 100%
rename from software/moregroupware/instance.cfg
rename to software/unstable/moregroupware/instance.cfg
diff --git a/software/moregroupware/software.cfg b/software/unstable/moregroupware/software.cfg
similarity index 100%
rename from software/moregroupware/software.cfg
rename to software/unstable/moregroupware/software.cfg
diff --git a/software/mybloggie/instance.cfg b/software/unstable/mybloggie/instance.cfg
similarity index 100%
rename from software/mybloggie/instance.cfg
rename to software/unstable/mybloggie/instance.cfg
diff --git a/software/mybloggie/software.cfg b/software/unstable/mybloggie/software.cfg
similarity index 100%
rename from software/mybloggie/software.cfg
rename to software/unstable/mybloggie/software.cfg
diff --git a/software/mytinytodo/instance.cfg b/software/unstable/mytinytodo/instance.cfg
similarity index 100%
rename from software/mytinytodo/instance.cfg
rename to software/unstable/mytinytodo/instance.cfg
diff --git a/software/mytinytodo/software.cfg b/software/unstable/mytinytodo/software.cfg
similarity index 100%
rename from software/mytinytodo/software.cfg
rename to software/unstable/mytinytodo/software.cfg
diff --git a/software/net2ftp/configure.py b/software/unstable/net2ftp/configure.py
similarity index 100%
rename from software/net2ftp/configure.py
rename to software/unstable/net2ftp/configure.py
diff --git a/software/net2ftp/instance.cfg b/software/unstable/net2ftp/instance.cfg
similarity index 100%
rename from software/net2ftp/instance.cfg
rename to software/unstable/net2ftp/instance.cfg
diff --git a/software/net2ftp/software.cfg b/software/unstable/net2ftp/software.cfg
similarity index 100%
rename from software/net2ftp/software.cfg
rename to software/unstable/net2ftp/software.cfg
diff --git a/software/net2ftp/template/net2ftp.inc.php.in b/software/unstable/net2ftp/template/net2ftp.inc.php.in
similarity index 100%
rename from software/net2ftp/template/net2ftp.inc.php.in
rename to software/unstable/net2ftp/template/net2ftp.inc.php.in
diff --git a/software/newsevolution/instance.cfg b/software/unstable/newsevolution/instance.cfg
similarity index 100%
rename from software/newsevolution/instance.cfg
rename to software/unstable/newsevolution/instance.cfg
diff --git a/software/newsevolution/software.cfg b/software/unstable/newsevolution/software.cfg
similarity index 100%
rename from software/newsevolution/software.cfg
rename to software/unstable/newsevolution/software.cfg
diff --git a/software/nosqltestbed/instance.cfg b/software/unstable/nosqltestbed/instance.cfg
similarity index 100%
rename from software/nosqltestbed/instance.cfg
rename to software/unstable/nosqltestbed/instance.cfg
diff --git a/software/nosqltestbed/software.cfg b/software/unstable/nosqltestbed/software.cfg
similarity index 100%
rename from software/nosqltestbed/software.cfg
rename to software/unstable/nosqltestbed/software.cfg
diff --git a/software/nucleus/configure-nucleus.py b/software/unstable/nucleus/configure-nucleus.py
similarity index 100%
rename from software/nucleus/configure-nucleus.py
rename to software/unstable/nucleus/configure-nucleus.py
diff --git a/software/nucleus/instance.cfg b/software/unstable/nucleus/instance.cfg
similarity index 100%
rename from software/nucleus/instance.cfg
rename to software/unstable/nucleus/instance.cfg
diff --git a/software/nucleus/software.cfg b/software/unstable/nucleus/software.cfg
similarity index 100%
rename from software/nucleus/software.cfg
rename to software/unstable/nucleus/software.cfg
diff --git a/software/openX/instance.cfg b/software/unstable/openX/instance.cfg
similarity index 100%
rename from software/openX/instance.cfg
rename to software/unstable/openX/instance.cfg
diff --git a/software/openX/software.cfg b/software/unstable/openX/software.cfg
similarity index 100%
rename from software/openX/software.cfg
rename to software/unstable/openX/software.cfg
diff --git a/software/openemr/configure-openemr.py b/software/unstable/openemr/configure-openemr.py
similarity index 100%
rename from software/openemr/configure-openemr.py
rename to software/unstable/openemr/configure-openemr.py
diff --git a/software/openemr/instance.cfg b/software/unstable/openemr/instance.cfg
similarity index 100%
rename from software/openemr/instance.cfg
rename to software/unstable/openemr/instance.cfg
diff --git a/software/openemr/software.cfg b/software/unstable/openemr/software.cfg
similarity index 100%
rename from software/openemr/software.cfg
rename to software/unstable/openemr/software.cfg
diff --git a/software/opengoo/config-form.php.in b/software/unstable/opengoo/config-form.php.in
similarity index 100%
rename from software/opengoo/config-form.php.in
rename to software/unstable/opengoo/config-form.php.in
diff --git a/software/opengoo/software.cfg b/software/unstable/opengoo/software.cfg
similarity index 100%
rename from software/opengoo/software.cfg
rename to software/unstable/opengoo/software.cfg
diff --git a/software/os-commerce/instance.cfg b/software/unstable/os-commerce/instance.cfg
similarity index 100%
rename from software/os-commerce/instance.cfg
rename to software/unstable/os-commerce/instance.cfg
diff --git a/software/os-commerce/software.cfg b/software/unstable/os-commerce/software.cfg
similarity index 100%
rename from software/os-commerce/software.cfg
rename to software/unstable/os-commerce/software.cfg
diff --git a/software/ouapi/instance.cfg b/software/unstable/ouapi/instance.cfg
similarity index 100%
rename from software/ouapi/instance.cfg
rename to software/unstable/ouapi/instance.cfg
diff --git a/software/ouapi/software.cfg b/software/unstable/ouapi/software.cfg
similarity index 100%
rename from software/ouapi/software.cfg
rename to software/unstable/ouapi/software.cfg
diff --git a/software/owncloud/instance.cfg b/software/unstable/owncloud/instance.cfg
similarity index 100%
rename from software/owncloud/instance.cfg
rename to software/unstable/owncloud/instance.cfg
diff --git a/software/owncloud/software.cfg b/software/unstable/owncloud/software.cfg
similarity index 100%
rename from software/owncloud/software.cfg
rename to software/unstable/owncloud/software.cfg
diff --git a/software/phenix/instance.cfg b/software/unstable/phenix/instance.cfg
similarity index 100%
rename from software/phenix/instance.cfg
rename to software/unstable/phenix/instance.cfg
diff --git a/software/phenix/software.cfg b/software/unstable/phenix/software.cfg
similarity index 100%
rename from software/phenix/software.cfg
rename to software/unstable/phenix/software.cfg
diff --git a/software/phpbb/instance.cfg b/software/unstable/phpbb/instance.cfg
similarity index 100%
rename from software/phpbb/instance.cfg
rename to software/unstable/phpbb/instance.cfg
diff --git a/software/phpbb/software.cfg b/software/unstable/phpbb/software.cfg
similarity index 100%
rename from software/phpbb/software.cfg
rename to software/unstable/phpbb/software.cfg
diff --git a/software/phpbms/instance.cfg b/software/unstable/phpbms/instance.cfg
similarity index 100%
rename from software/phpbms/instance.cfg
rename to software/unstable/phpbms/instance.cfg
diff --git a/software/phpbms/phpbms_for_mysql5.patch b/software/unstable/phpbms/phpbms_for_mysql5.patch
similarity index 100%
rename from software/phpbms/phpbms_for_mysql5.patch
rename to software/unstable/phpbms/phpbms_for_mysql5.patch
diff --git a/software/phpbms/software.cfg b/software/unstable/phpbms/software.cfg
similarity index 100%
rename from software/phpbms/software.cfg
rename to software/unstable/phpbms/software.cfg
diff --git a/software/phpbms/template/settings.php.in b/software/unstable/phpbms/template/settings.php.in
similarity index 100%
rename from software/phpbms/template/settings.php.in
rename to software/unstable/phpbms/template/settings.php.in
diff --git a/software/phpfin/configure-phpfin.py b/software/unstable/phpfin/configure-phpfin.py
similarity index 100%
rename from software/phpfin/configure-phpfin.py
rename to software/unstable/phpfin/configure-phpfin.py
diff --git a/software/phpfin/instance.cfg b/software/unstable/phpfin/instance.cfg
similarity index 100%
rename from software/phpfin/instance.cfg
rename to software/unstable/phpfin/instance.cfg
diff --git a/software/phpfin/software.cfg b/software/unstable/phpfin/software.cfg
similarity index 100%
rename from software/phpfin/software.cfg
rename to software/unstable/phpfin/software.cfg
diff --git a/software/phpfin/template/connection.inc.in b/software/unstable/phpfin/template/connection.inc.in
similarity index 100%
rename from software/phpfin/template/connection.inc.in
rename to software/unstable/phpfin/template/connection.inc.in
diff --git a/software/phpip/instance.cfg b/software/unstable/phpip/instance.cfg
similarity index 100%
rename from software/phpip/instance.cfg
rename to software/unstable/phpip/instance.cfg
diff --git a/software/phpip/software.cfg b/software/unstable/phpip/software.cfg
similarity index 100%
rename from software/phpip/software.cfg
rename to software/unstable/phpip/software.cfg
diff --git a/software/phpip/template/database.php.in b/software/unstable/phpip/template/database.php.in
similarity index 100%
rename from software/phpip/template/database.php.in
rename to software/unstable/phpip/template/database.php.in
diff --git a/software/phpmyadmin/instance.cfg b/software/unstable/phpmyadmin/instance.cfg
similarity index 100%
rename from software/phpmyadmin/instance.cfg
rename to software/unstable/phpmyadmin/instance.cfg
diff --git a/software/phpmyadmin/phpmyadmin.inc.php.in b/software/unstable/phpmyadmin/phpmyadmin.inc.php.in
similarity index 100%
rename from software/phpmyadmin/phpmyadmin.inc.php.in
rename to software/unstable/phpmyadmin/phpmyadmin.inc.php.in
diff --git a/software/phpmyadmin/software.cfg b/software/unstable/phpmyadmin/software.cfg
similarity index 100%
rename from software/phpmyadmin/software.cfg
rename to software/unstable/phpmyadmin/software.cfg
diff --git a/software/phpmybackup/instance.cfg b/software/unstable/phpmybackup/instance.cfg
similarity index 100%
rename from software/phpmybackup/instance.cfg
rename to software/unstable/phpmybackup/instance.cfg
diff --git a/software/phpmybackup/software.cfg b/software/unstable/phpmybackup/software.cfg
similarity index 100%
rename from software/phpmybackup/software.cfg
rename to software/unstable/phpmybackup/software.cfg
diff --git a/software/phpmyfaq/instance.cfg b/software/unstable/phpmyfaq/instance.cfg
similarity index 100%
rename from software/phpmyfaq/instance.cfg
rename to software/unstable/phpmyfaq/instance.cfg
diff --git a/software/phpmyfaq/software.cfg b/software/unstable/phpmyfaq/software.cfg
similarity index 100%
rename from software/phpmyfaq/software.cfg
rename to software/unstable/phpmyfaq/software.cfg
diff --git a/software/phpnuke/instance.cfg b/software/unstable/phpnuke/instance.cfg
similarity index 100%
rename from software/phpnuke/instance.cfg
rename to software/unstable/phpnuke/instance.cfg
diff --git a/software/phpnuke/software.cfg b/software/unstable/phpnuke/software.cfg
similarity index 100%
rename from software/phpnuke/software.cfg
rename to software/unstable/phpnuke/software.cfg
diff --git a/software/phpnuke/template/phpnuke.inc.php.in b/software/unstable/phpnuke/template/phpnuke.inc.php.in
similarity index 100%
rename from software/phpnuke/template/phpnuke.inc.php.in
rename to software/unstable/phpnuke/template/phpnuke.inc.php.in
diff --git a/software/phprojekt/instance.cfg b/software/unstable/phprojekt/instance.cfg
similarity index 100%
rename from software/phprojekt/instance.cfg
rename to software/unstable/phprojekt/instance.cfg
diff --git a/software/phprojekt/software.cfg b/software/unstable/phprojekt/software.cfg
similarity index 100%
rename from software/phprojekt/software.cfg
rename to software/unstable/phprojekt/software.cfg
diff --git a/software/pimcore/instance.cfg b/software/unstable/pimcore/instance.cfg
similarity index 100%
rename from software/pimcore/instance.cfg
rename to software/unstable/pimcore/instance.cfg
diff --git a/software/pimcore/software.cfg b/software/unstable/pimcore/software.cfg
similarity index 100%
rename from software/pimcore/software.cfg
rename to software/unstable/pimcore/software.cfg
diff --git a/software/piwigo/instance.cfg b/software/unstable/piwigo/instance.cfg
similarity index 100%
rename from software/piwigo/instance.cfg
rename to software/unstable/piwigo/instance.cfg
diff --git a/software/piwigo/software.cfg b/software/unstable/piwigo/software.cfg
similarity index 100%
rename from software/piwigo/software.cfg
rename to software/unstable/piwigo/software.cfg
diff --git a/software/piwigo/template/piwigo.inc.php.in b/software/unstable/piwigo/template/piwigo.inc.php.in
similarity index 100%
rename from software/piwigo/template/piwigo.inc.php.in
rename to software/unstable/piwigo/template/piwigo.inc.php.in
diff --git a/software/piwik/instance.cfg b/software/unstable/piwik/instance.cfg
similarity index 100%
rename from software/piwik/instance.cfg
rename to software/unstable/piwik/instance.cfg
diff --git a/software/piwik/software.cfg b/software/unstable/piwik/software.cfg
similarity index 100%
rename from software/piwik/software.cfg
rename to software/unstable/piwik/software.cfg
diff --git a/software/pixelpost/instance.cfg b/software/unstable/pixelpost/instance.cfg
similarity index 100%
rename from software/pixelpost/instance.cfg
rename to software/unstable/pixelpost/instance.cfg
diff --git a/software/pixelpost/pixelpost_for_mysql5.patch b/software/unstable/pixelpost/pixelpost_for_mysql5.patch
similarity index 100%
rename from software/pixelpost/pixelpost_for_mysql5.patch
rename to software/unstable/pixelpost/pixelpost_for_mysql5.patch
diff --git a/software/pixelpost/software.cfg b/software/unstable/pixelpost/software.cfg
similarity index 100%
rename from software/pixelpost/software.cfg
rename to software/unstable/pixelpost/software.cfg
diff --git a/software/prestashop/instance.cfg b/software/unstable/prestashop/instance.cfg
similarity index 100%
rename from software/prestashop/instance.cfg
rename to software/unstable/prestashop/instance.cfg
diff --git a/software/prestashop/software.cfg b/software/unstable/prestashop/software.cfg
similarity index 100%
rename from software/prestashop/software.cfg
rename to software/unstable/prestashop/software.cfg
diff --git a/software/proactive/instance.cfg b/software/unstable/proactive/instance.cfg
similarity index 100%
rename from software/proactive/instance.cfg
rename to software/unstable/proactive/instance.cfg
diff --git a/software/proactive/software.cfg b/software/unstable/proactive/software.cfg
similarity index 100%
rename from software/proactive/software.cfg
rename to software/unstable/proactive/software.cfg
diff --git a/software/projelead/instance.cfg b/software/unstable/projelead/instance.cfg
similarity index 100%
rename from software/projelead/instance.cfg
rename to software/unstable/projelead/instance.cfg
diff --git a/software/projelead/software.cfg b/software/unstable/projelead/software.cfg
similarity index 100%
rename from software/projelead/software.cfg
rename to software/unstable/projelead/software.cfg
diff --git a/software/pulse/instance.cfg b/software/unstable/pulse/instance.cfg
similarity index 100%
rename from software/pulse/instance.cfg
rename to software/unstable/pulse/instance.cfg
diff --git a/software/pulse/software.cfg b/software/unstable/pulse/software.cfg
similarity index 100%
rename from software/pulse/software.cfg
rename to software/unstable/pulse/software.cfg
diff --git a/software/punbb/instance.cfg b/software/unstable/punbb/instance.cfg
similarity index 100%
rename from software/punbb/instance.cfg
rename to software/unstable/punbb/instance.cfg
diff --git a/software/punbb/software.cfg b/software/unstable/punbb/software.cfg
similarity index 100%
rename from software/punbb/software.cfg
rename to software/unstable/punbb/software.cfg
diff --git a/software/punbb/template/punbb.inc.php.in b/software/unstable/punbb/template/punbb.inc.php.in
similarity index 100%
rename from software/punbb/template/punbb.inc.php.in
rename to software/unstable/punbb/template/punbb.inc.php.in
diff --git a/software/quick-cart/instance.cfg b/software/unstable/quick-cart/instance.cfg
similarity index 100%
rename from software/quick-cart/instance.cfg
rename to software/unstable/quick-cart/instance.cfg
diff --git a/software/quick-cart/software.cfg b/software/unstable/quick-cart/software.cfg
similarity index 100%
rename from software/quick-cart/software.cfg
rename to software/unstable/quick-cart/software.cfg
diff --git a/software/quick-cms/instance.cfg b/software/unstable/quick-cms/instance.cfg
similarity index 100%
rename from software/quick-cms/instance.cfg
rename to software/unstable/quick-cms/instance.cfg
diff --git a/software/quick-cms/software.cfg b/software/unstable/quick-cms/software.cfg
similarity index 100%
rename from software/quick-cms/software.cfg
rename to software/unstable/quick-cms/software.cfg
diff --git a/software/reverse-proxy-nginx/common.cfg b/software/unstable/reverse-proxy-nginx/common.cfg
similarity index 100%
rename from software/reverse-proxy-nginx/common.cfg
rename to software/unstable/reverse-proxy-nginx/common.cfg
diff --git a/software/reverse-proxy-nginx/development.cfg b/software/unstable/reverse-proxy-nginx/development.cfg
similarity index 100%
rename from software/reverse-proxy-nginx/development.cfg
rename to software/unstable/reverse-proxy-nginx/development.cfg
diff --git a/software/reverse-proxy-nginx/instance.cfg.in b/software/unstable/reverse-proxy-nginx/instance.cfg.in
similarity index 100%
rename from software/reverse-proxy-nginx/instance.cfg.in
rename to software/unstable/reverse-proxy-nginx/instance.cfg.in
diff --git a/software/sheepdogtestbed/instance.cfg b/software/unstable/sheepdogtestbed/instance.cfg
similarity index 100%
rename from software/sheepdogtestbed/instance.cfg
rename to software/unstable/sheepdogtestbed/instance.cfg
diff --git a/software/sheepdogtestbed/software.cfg b/software/unstable/sheepdogtestbed/software.cfg
similarity index 100%
rename from software/sheepdogtestbed/software.cfg
rename to software/unstable/sheepdogtestbed/software.cfg
diff --git a/software/silverstripe/instance.cfg b/software/unstable/silverstripe/instance.cfg
similarity index 100%
rename from software/silverstripe/instance.cfg
rename to software/unstable/silverstripe/instance.cfg
diff --git a/software/silverstripe/software.cfg b/software/unstable/silverstripe/software.cfg
similarity index 100%
rename from software/silverstripe/software.cfg
rename to software/unstable/silverstripe/software.cfg
diff --git a/software/simple-invoicing/instance.cfg b/software/unstable/simple-invoicing/instance.cfg
similarity index 100%
rename from software/simple-invoicing/instance.cfg
rename to software/unstable/simple-invoicing/instance.cfg
diff --git a/software/simple-invoicing/software.cfg b/software/unstable/simple-invoicing/software.cfg
similarity index 100%
rename from software/simple-invoicing/software.cfg
rename to software/unstable/simple-invoicing/software.cfg
diff --git a/software/simpleMachineForum/instance.cfg b/software/unstable/simpleMachineForum/instance.cfg
similarity index 100%
rename from software/simpleMachineForum/instance.cfg
rename to software/unstable/simpleMachineForum/instance.cfg
diff --git a/software/simpleMachineForum/software.cfg b/software/unstable/simpleMachineForum/software.cfg
similarity index 100%
rename from software/simpleMachineForum/software.cfg
rename to software/unstable/simpleMachineForum/software.cfg
diff --git a/software/spip/instance.cfg b/software/unstable/spip/instance.cfg
similarity index 100%
rename from software/spip/instance.cfg
rename to software/unstable/spip/instance.cfg
diff --git a/software/spip/software.cfg b/software/unstable/spip/software.cfg
similarity index 100%
rename from software/spip/software.cfg
rename to software/unstable/spip/software.cfg
diff --git a/software/statusnet/instance.cfg b/software/unstable/statusnet/instance.cfg
similarity index 100%
rename from software/statusnet/instance.cfg
rename to software/unstable/statusnet/instance.cfg
diff --git a/software/statusnet/software.cfg b/software/unstable/statusnet/software.cfg
similarity index 100%
rename from software/statusnet/software.cfg
rename to software/unstable/statusnet/software.cfg
diff --git a/software/sugar-crm/instance.cfg b/software/unstable/sugar-crm/instance.cfg
similarity index 100%
rename from software/sugar-crm/instance.cfg
rename to software/unstable/sugar-crm/instance.cfg
diff --git a/software/sugar-crm/software.cfg b/software/unstable/sugar-crm/software.cfg
similarity index 100%
rename from software/sugar-crm/software.cfg
rename to software/unstable/sugar-crm/software.cfg
diff --git a/software/thelia/instance.cfg b/software/unstable/thelia/instance.cfg
similarity index 100%
rename from software/thelia/instance.cfg
rename to software/unstable/thelia/instance.cfg
diff --git a/software/thelia/software.cfg b/software/unstable/thelia/software.cfg
similarity index 100%
rename from software/thelia/software.cfg
rename to software/unstable/thelia/software.cfg
diff --git a/software/tiki/instance.cfg b/software/unstable/tiki/instance.cfg
similarity index 100%
rename from software/tiki/instance.cfg
rename to software/unstable/tiki/instance.cfg
diff --git a/software/tiki/software.cfg b/software/unstable/tiki/software.cfg
similarity index 100%
rename from software/tiki/software.cfg
rename to software/unstable/tiki/software.cfg
diff --git a/software/tt-rss/development.cfg b/software/unstable/tt-rss/development.cfg
similarity index 100%
rename from software/tt-rss/development.cfg
rename to software/unstable/tt-rss/development.cfg
diff --git a/software/tt-rss/instance-custom.cfg.in b/software/unstable/tt-rss/instance-custom.cfg.in
similarity index 100%
rename from software/tt-rss/instance-custom.cfg.in
rename to software/unstable/tt-rss/instance-custom.cfg.in
diff --git a/software/tt-rss/script/tt-rss.sql b/software/unstable/tt-rss/script/tt-rss.sql
similarity index 100%
rename from software/tt-rss/script/tt-rss.sql
rename to software/unstable/tt-rss/script/tt-rss.sql
diff --git a/software/tt-rss/software.cfg b/software/unstable/tt-rss/software.cfg
similarity index 100%
rename from software/tt-rss/software.cfg
rename to software/unstable/tt-rss/software.cfg
diff --git a/software/tt-rss/template/config.php.in b/software/unstable/tt-rss/template/config.php.in
similarity index 100%
rename from software/tt-rss/template/config.php.in
rename to software/unstable/tt-rss/template/config.php.in
diff --git a/software/ultimate-php-borad/instance.cfg b/software/unstable/ultimate-php-borad/instance.cfg
similarity index 100%
rename from software/ultimate-php-borad/instance.cfg
rename to software/unstable/ultimate-php-borad/instance.cfg
diff --git a/software/ultimate-php-borad/software.cfg b/software/unstable/ultimate-php-borad/software.cfg
similarity index 100%
rename from software/ultimate-php-borad/software.cfg
rename to software/unstable/ultimate-php-borad/software.cfg
diff --git a/software/vifib/software.cfg b/software/unstable/vifib/software.cfg
similarity index 100%
rename from software/vifib/software.cfg
rename to software/unstable/vifib/software.cfg
diff --git a/software/web2project/instance.cfg b/software/unstable/web2project/instance.cfg
similarity index 100%
rename from software/web2project/instance.cfg
rename to software/unstable/web2project/instance.cfg
diff --git a/software/web2project/software.cfg b/software/unstable/web2project/software.cfg
similarity index 100%
rename from software/web2project/software.cfg
rename to software/unstable/web2project/software.cfg
diff --git a/software/wikyblog/instance.cfg b/software/unstable/wikyblog/instance.cfg
similarity index 100%
rename from software/wikyblog/instance.cfg
rename to software/unstable/wikyblog/instance.cfg
diff --git a/software/wikyblog/software.cfg b/software/unstable/wikyblog/software.cfg
similarity index 100%
rename from software/wikyblog/software.cfg
rename to software/unstable/wikyblog/software.cfg
diff --git a/software/xaraya/instance.cfg b/software/unstable/xaraya/instance.cfg
similarity index 100%
rename from software/xaraya/instance.cfg
rename to software/unstable/xaraya/instance.cfg
diff --git a/software/xaraya/software.cfg b/software/unstable/xaraya/software.cfg
similarity index 100%
rename from software/xaraya/software.cfg
rename to software/unstable/xaraya/software.cfg
diff --git a/software/xellplan/instance.cfg b/software/unstable/xellplan/instance.cfg
similarity index 100%
rename from software/xellplan/instance.cfg
rename to software/unstable/xellplan/instance.cfg
diff --git a/software/xellplan/software.cfg b/software/unstable/xellplan/software.cfg
similarity index 100%
rename from software/xellplan/software.cfg
rename to software/unstable/xellplan/software.cfg
diff --git a/software/xellplan/template/sfx.php.in b/software/unstable/xellplan/template/sfx.php.in
similarity index 100%
rename from software/xellplan/template/sfx.php.in
rename to software/unstable/xellplan/template/sfx.php.in
diff --git a/software/xoops/instance.cfg b/software/unstable/xoops/instance.cfg
similarity index 100%
rename from software/xoops/instance.cfg
rename to software/unstable/xoops/instance.cfg
diff --git a/software/xoops/software.cfg b/software/unstable/xoops/software.cfg
similarity index 100%
rename from software/xoops/software.cfg
rename to software/unstable/xoops/software.cfg
diff --git a/software/xwiki/instance.cfg b/software/unstable/xwiki/instance.cfg
similarity index 100%
rename from software/xwiki/instance.cfg
rename to software/unstable/xwiki/instance.cfg
diff --git a/software/xwiki/software.cfg b/software/unstable/xwiki/software.cfg
similarity index 100%
rename from software/xwiki/software.cfg
rename to software/unstable/xwiki/software.cfg
diff --git a/software/zencart/configure.py b/software/unstable/zencart/configure.py
similarity index 100%
rename from software/zencart/configure.py
rename to software/unstable/zencart/configure.py
diff --git a/software/zencart/instance.cfg b/software/unstable/zencart/instance.cfg
similarity index 100%
rename from software/zencart/instance.cfg
rename to software/unstable/zencart/instance.cfg
diff --git a/software/zencart/software.cfg b/software/unstable/zencart/software.cfg
similarity index 100%
rename from software/zencart/software.cfg
rename to software/unstable/zencart/software.cfg
diff --git a/software/zenphoto/instance.cfg b/software/unstable/zenphoto/instance.cfg
similarity index 100%
rename from software/zenphoto/instance.cfg
rename to software/unstable/zenphoto/instance.cfg
diff --git a/software/zenphoto/software.cfg b/software/unstable/zenphoto/software.cfg
similarity index 100%
rename from software/zenphoto/software.cfg
rename to software/unstable/zenphoto/software.cfg
diff --git a/software/zikula/configure-zikula.py b/software/unstable/zikula/configure-zikula.py
similarity index 100%
rename from software/zikula/configure-zikula.py
rename to software/unstable/zikula/configure-zikula.py
diff --git a/software/zikula/instance.cfg b/software/unstable/zikula/instance.cfg
similarity index 100%
rename from software/zikula/instance.cfg
rename to software/unstable/zikula/instance.cfg
diff --git a/software/zikula/software.cfg b/software/unstable/zikula/software.cfg
similarity index 100%
rename from software/zikula/software.cfg
rename to software/unstable/zikula/software.cfg
diff --git a/software/zimbra-kvm/README.txt b/software/unstable/zimbra-kvm/README.txt
similarity index 100%
rename from software/zimbra-kvm/README.txt
rename to software/unstable/zimbra-kvm/README.txt
diff --git a/software/zimbra-kvm/common.cfg b/software/unstable/zimbra-kvm/common.cfg
similarity index 100%
rename from software/zimbra-kvm/common.cfg
rename to software/unstable/zimbra-kvm/common.cfg
diff --git a/software/zimbra-kvm/development.cfg b/software/unstable/zimbra-kvm/development.cfg
similarity index 100%
rename from software/zimbra-kvm/development.cfg
rename to software/unstable/zimbra-kvm/development.cfg
diff --git a/software/zimbra-kvm/instance-kvm.cfg.in b/software/unstable/zimbra-kvm/instance-kvm.cfg.in
similarity index 100%
rename from software/zimbra-kvm/instance-kvm.cfg.in
rename to software/unstable/zimbra-kvm/instance-kvm.cfg.in
diff --git a/software/zimbra-kvm/instance.cfg.in b/software/unstable/zimbra-kvm/instance.cfg.in
similarity index 100%
rename from software/zimbra-kvm/instance.cfg.in
rename to software/unstable/zimbra-kvm/instance.cfg.in
diff --git a/software/zimbra-kvm/software.cfg b/software/unstable/zimbra-kvm/software.cfg
similarity index 100%
rename from software/zimbra-kvm/software.cfg
rename to software/unstable/zimbra-kvm/software.cfg
-- 
2.30.9