From 248a36e47dfb2c7a105b9f46c31d1884914a344b Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Sun, 30 Oct 2011 17:16:51 +0000
Subject: [PATCH] Remove temp files

---
 software/phenix/instance.cfg~ | 17 ---------
 software/phenix/software.cfg~ | 69 -----------------------------------
 2 files changed, 86 deletions(-)
 delete mode 100644 software/phenix/instance.cfg~
 delete mode 100644 software/phenix/software.cfg~

diff --git a/software/phenix/instance.cfg~ b/software/phenix/instance.cfg~
deleted file mode 100644
index fffebea8f..000000000
--- a/software/phenix/instance.cfg~
+++ /dev/null
@@ -1,17 +0,0 @@
-[buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
-
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
diff --git a/software/phenix/software.cfg~ b/software/phenix/software.cfg~
deleted file mode 100644
index 479710c19..000000000
--- a/software/phenix/software.cfg~
+++ /dev/null
@@ -1,69 +0,0 @@
-[buildout]
-versions = versions
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
-  
-extends =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
-
-allow-hosts += alastairs-place.net
-
-[application]
-recipe = hexagonit.recipe.download
-url = Student shall put here url of zipped or tarballed web page or application
-#md5sum = Student may put here md5sum of this file, this is good idea
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-
-[application-template]
-recipe = slapos.recipe.download
-url = Student shall put here url to template file for application
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
-[application-configuration]
-location = Student shall put here relative path to application top level directory where configuration shall be created
-
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
-
-- 
2.30.9