diff --git a/software/joomla/database.xml-in b/software/joomla/database.xml-in new file mode 100644 index 0000000000000000000000000000000000000000..8cf51dd2f9f3716a2f567d9f95ad29587b5c83a1 --- /dev/null +++ b/software/joomla/database.xml-in @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<form> + <fieldset> + <fieldset name="basic"> + <field name="db_type" type="databaseconnection" + id="db_type" class="inputbox" + label="INSTL_DATABASE_TYPE_LABEL" + supported="mysql,mysqli,sqlsrv,sqlazure" + required="true" + default="mysql" + filter="string" + /> + + <field name="db_host" type="text" id="db_host" class="inputbox" + label="INSTL_DATABASE_HOST_LABEL" + default="%(mysql_host)s" + required="true" + /> + <field name="db_user" type="text" id="db_user" class="inputbox" + label="INSTL_DATABASE_USER_LABEL" + default="%(mysql_user)s" + required="true" + /> + <field name="db_pass" type="password" id="db_pass" class="inputbox" + label="INSTL_DATABASE_PASSWORD_LABEL" + default="%(mysql_password)s" + filter="raw" + /> + <field name="db_name" type="text" id="db_name" class="inputbox" + label="INSTL_DATABASE_NAME_LABEL" + default="%(mysql_database)s" + required="true" + /> + </fieldset> + + <!-- Advanced Settings --> + <fieldset name="advanced"> + <field name="db_old" type="radio" id="db_old" class="inputbox" + label="INSTL_DATABASE_OLD_PROCESS_LABEL" + default="backup" + required="true" + > + <option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option> + <option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option> + </field> + <field name="db_prefix" type="prefix" id="db_prefix" class="inputbox" + label="INSTL_DATABASE_PREFIX_LABEL" + required="true" + validate="prefix" + message="INSTL_DATABASE_PREFIX_MSG" + /> + </fieldset> + </fieldset> +</form> diff --git a/software/joomla/instance.cfg b/software/joomla/instance.cfg index 644d6d54dddb77c39d57ec31f9ad10fdb58223b0..e835408998d1b87833d9691e4a914dbcf8884faf 100644 --- a/software/joomla/instance.cfg +++ b/software/joomla/instance.cfg @@ -1,13 +1,8 @@ [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} - httpd_binary = ${apache:location}/bin/httpd mysql_base_directory = ${mariadb:location} mysql_binary = ${mariadb:location}/bin/mysql diff --git a/software/joomla/software.cfg b/software/joomla/software.cfg index e64217991915105a7f3192612c41965bd3dee658..d53fad9c12a2cc2e69ffe256bef39e79e4f18512 100644 --- a/software/joomla/software.cfg +++ b/software/joomla/software.cfg @@ -1,121 +1,29 @@ [buildout] versions = versions -parts = - template - apache-php - mariadb - eggs - instance-recipe-egg - downloadcache-workaround + extends = - ../../stack/lamp.cfg + ../../stack/lamp/buildout.cfg ../../stack/shacache-client.cfg [application] recipe = slapos.recipe.build:download-unpacked -url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz -md5sum = 19451c0352e4c72d871cc8817126286a +url = http://joomlacode.org/gf/download/frsrelease/17173/74758/Joomla_2.5.6-Stable-Full_Package.zip +md5sum = 3aa7d7b58bfa4eec3c3724209894d14e +strip-top-level-dir = false -[instance-recipe] -egg = slapos.cookbook -module = lamp.simple - -[template] -# Default template for the instance. -recipe = slapos.recipe.template -url = ${:_profile_base_location_}/instance.cfg -#${:_profile_base_location_}/instance.cfg -#md5sum = Student shall put md5 of instance.cfg here -output = ${buildout:directory}/template.cfg +[application-template] +recipe = slapos.recipe.download +url = ${:_profile_base_location_}/database.xml-in +md5sum = 6ae063318a251b70ae7d037e3ae375d6 +download-only = True +filename = template.in mode = 0644 - -[instance-recipe-egg] -recipe = zc.recipe.egg -eggs = ${instance-recipe:egg} - -[versions] -# Use SlapOS patched zc.buildout -zc.buildout = 1.5.3-dev-SlapOS-010 - -Jinja2 = 2.6 -MySQL-python = 1.2.3 -Werkzeug = 0.8.1 -apache-libcloud = 0.5.2 -buildout-versions = 1.7 -hexagonit.recipe.cmmi = 1.5.0 -meld3 = 0.6.7 -plone.recipe.command = 1.1 -slapos.cookbook = 0.34 -slapos.recipe.build = 0.7 -slapos.recipe.download = 1.0.dev-r4053 -slapos.recipe.template = 2.2 -slapos.toolbox = 0.10 - -# Required by: -# slapos.core==0.18 -# slapos.toolbox==0.10 -Flask = 0.8 - -# Required by: -# slapos.cookbook==0.34 -PyXML = 0.8.4 - -# Required by: -# hexagonit.recipe.cmmi==1.5.0 -hexagonit.recipe.download = 1.5.1 - -# Required by: -# slapos.cookbook==0.34 -# slapos.core==0.18 -# slapos.toolbox==0.10 -# xml-marshaller==0.9.7 -lxml = 2.3.1 - -# Required by: -# slapos.cookbook==0.34 -netaddr = 0.7.6 - -# Required by: -# slapos.core==0.18 -netifaces = 0.6 - -# Required by: -# slapos.toolbox==0.10 -paramiko = 1.7.7.1 - -# Required by: -# slapos.toolbox==0.10 -psutil = 0.3.0 - -# Required by: -# slapos.cookbook==0.34 -# slapos.core==0.18 -# slapos.toolbox==0.10 -setuptools = 0.6c12dev-r88846 - -# Required by: -# slapos.cookbook==0.34 -# slapos.toolbox==0.10 -slapos.core = 0.18 - -# Required by: -# slapos.core==0.18 -supervisor = 3.0a10 - -# Required by: -# slapos.cookbook==0.34 -# slapos.toolbox==0.10 -xml-marshaller = 0.9.7 - -# Required by: -# slapos.cookbook==0.34 -zc.recipe.egg = 1.3.2 - -# Required by: -# slapos.core==0.18 -zope.interface = 3.8.0 +location = ${buildout:parts-directory}/${:_buildout_section_name_} + +[application-configuration] +location = installation/models/forms/database.xml [downloadcache-workaround] # workaround irritating problem of hexagonit.recipe.cmmi which automatically diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index edece70ca64fbbb4b20c0002b2dbf67758f2329c..dcffedff2883e7ff542b6670a2d2c70fa2491df9 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -87,7 +87,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-mariadb.cfg output = ${buildout:directory}/template-mariadb.cfg -md5sum = ba5ebecbfe9fbb96d48f2baa43c37065 +md5sum = 767452bc503ff6c1b7af0ebfac590c9f mode = 0644 [template-mariadb-pbsready]