switch software type

software/proftpd/buildout.hash.cfg

@@ -16,9 +16,13 @@
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = fcf4ef4e09dc7238616054973fb01ace
+md5sum = 8ed5b4a7940db47ccb386c2f4e3e7273
+
+[instance-default]
+filename = instance-default.cfg.in
+md5sum = d9598ff3445cc061e83c436f3ad5d2b3
 
 [proftpd-config-file]
 filename = proftpd-config-file.cfg.in
-md5sum = 5a5a3add4782761eb64f092781a256b4
+md5sum = 46cbe4ea65b445822d3da32c76c7d67d
 

software/proftpd/instance-default.cfg.in

+[buildout]
+parts =
+  promises
+  publish-connection-parameter
+
+
+[instance-parameter]
+# TODO: this is not needed
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = ${buildout:directory}
+etc = ${:home}/etc
+var = ${:home}/var
+log = ${:var}/log
+srv = ${:home}/srv
+service = ${:etc}/service
+promise = ${:etc}/promise
+proftpd-dir = ${:srv}/proftpd/
+ssh-authorized-keys-dir = ${:etc}/authorized_keys/
+
+[config-file]
+recipe = slapos.recipe.template:jinja2
+template = {{ software_parts_directory }}/${:_buildout_section_name_}/${:_buildout_section_name_}.cfg.in
+rendered = ${directory:etc}/${:_buildout_section_name_}.cfg
+mode = 0644
+extensions = jinja2.ext.do
+
+[check-port-listening-promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/${:_buildout_section_name_}
+
+[proftpd-userinfo]
+recipe = slapos.cookbook:userinfo
+
+[proftpd-password]
+recipe = slapos.cookbook:generate.password
+username = proftpd
+bytes = 12
+
+[proftpd]
+ipv6 = ${instance-parameter:ipv6-random}
+ipv4 = ${instance-parameter:ipv4-random}
+host = ${:ipv6}
+sftp-port = {{ slapparameter_dict.get('port', 18022) }}
+url = sftp://[${:host}]:${:sftp-port}
+data-dir = ${directory:proftpd-dir}
+user=${proftpd-userinfo:pw-name}
+group=${proftpd-userinfo:gr-name}
+sftp-log=${directory:log}/proftpd-sftp.log
+xfer-log=${directory:log}/proftpd-xfer.log
+ban-log=${directory:log}/proftpd-ban.log
+ssh-host-rsa-key=${ssh-host-rsa-key:output}
+ssh-host-dsa-key=${ssh-host-dsa-key:output}
+ssh-host-ecdsa-key=${ssh-host-ecdsa-key:output}
+ssh-authorized-keys-dir = ${directory:ssh-authorized-keys-dir}
+ban-table=${directory:srv}/proftpd-ban-table
+auth-user-file=${auth-user-file:output}
+
+recipe = slapos.cookbook:wrapper
+command-line =
+   {{ proftpd_bin }} --nodaemon --config ${proftpd-config-file:rendered}
+wrapper-path = ${directory:service}/proftpd
+
+[proftpd-listen-promise]
+<= check-port-listening-promise
+hostname = ${proftpd:ipv6}
+port = ${proftpd:sftp-port}
+
+
+[auth-user-file]
+recipe = plone.recipe.command
+output = ${directory:etc}/ftpd.passwd
+command =
+  echo ${proftpd-password:passwd} | {{ ftpasswd_bin }} --stdin --passwd --name=${proftpd-password:username} --home=${proftpd:data-dir} --shell=/bin/false --uid=`id -u` --gid=`id -g` --file ${:output}
+update-command = ${:command}
+
+
+[ssh-keygen-base]
+recipe = plone.recipe.command
+output = ${directory:etc}/${:_buildout_section_name_}
+command = {{ ssh_keygen_bin }} -f ${:output} -N '' ${:extra-args}
+
+[ssh-host-rsa-key]
+<=ssh-keygen-base
+extra-args=-t rsa
+[ssh-host-dsa-key]
+<=ssh-keygen-base
+extra-args=-t dsa
+[ssh-host-ecdsa-key]
+<=ssh-keygen-base
+extra-args=-t ecdsa -b 521
+
+
+[proftpd-config-file]
+<= config-file
+context =
+  section proftpd proftpd
+  key slapparameter_dict slap-configuration:configuration
+
+[promises]
+recipe =
+instance-promises =
+  ${proftpd-listen-promise:path}
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+url = ${proftpd:url}
+user = ${proftpd-password:username}
+password = ${proftpd-password:passwd}

software/proftpd/instance.cfg.in

 [buildout]
-parts =
-  promises
-  publish-connection-parameter
-
+parts = switch-softwaretype
 eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
-offline = true
-
-
-[instance-parameter]
-recipe = slapos.cookbook:slapconfiguration
-computer = ${slap-connection:computer-id}
-partition = ${slap-connection:partition-id}
-url = ${slap-connection:server-url}
-key = ${slap-connection:key-file}
-cert = ${slap-connection:cert-file}
 
 [slap-configuration]
-# apache-frontend reads from from a part named [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = ${slap-connection:computer-id}
 partition = ${slap-connection:partition-id}
@@ -25,104 +11,29 @@ url = ${slap-connection:server-url}
 key = ${slap-connection:key-file}
 cert = ${slap-connection:cert-file}
 
-[directory]
-recipe = slapos.cookbook:mkdirectory
-home = ${buildout:directory}
-etc = ${:home}/etc
-var = ${:home}/var
-log = ${:var}/log
-srv = ${:home}/srv
-service = ${:etc}/service
-promise = ${:etc}/promise
-proftpd-dir = ${:srv}/proftpd/
-ssh-authorized-keys-dir = ${:etc}/authorized_keys/
-
-[config-file]
+[instance-template]
 recipe = slapos.recipe.template:jinja2
-template = {{ buildout['parts-directory'] }}/${:_buildout_section_name_}/${:_buildout_section_name_}.cfg.in
-rendered = ${directory:etc}/${:_buildout_section_name_}.cfg
+filename = ${:_buildout_section_name_}.cfg
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 mode = 0644
 extensions = jinja2.ext.do
-
-[check-port-listening-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/${:_buildout_section_name_}
-
-[proftpd-userinfo]
-recipe = slapos.cookbook:userinfo
-
-[proftpd-password]
-recipe = slapos.cookbook:generate.password
-username = proftpd
-bytes = 12
-
-[proftpd]
-ipv6 = ${instance-parameter:ipv6-random}
-ipv4 = ${instance-parameter:ipv4-random}
-host = ${:ipv6}
-sftp-port = 18022
-url = sftp://[${:host}]:${:sftp-port}
-data-dir = ${directory:proftpd-dir}
-user=${proftpd-userinfo:pw-name}
-group=${proftpd-userinfo:gr-name}
-sftp-log=${directory:log}/proftpd-sftp.log
-xfer-log=${directory:log}/proftpd-xfer.log
-ban-log=${directory:log}/proftpd-ban.log
-ssh-host-rsa-key=${ssh-host-rsa-key:output}
-ssh-host-dsa-key=${ssh-host-dsa-key:output}
-ssh-host-ecdsa-key=${ssh-host-ecdsa-key:output}
-ssh-authorized-keys-dir = ${directory:ssh-authorized-keys-dir}
-ban-table=${directory:srv}/proftpd-ban-table
-auth-user-file=${auth-user-file:output}
-
-recipe = slapos.cookbook:wrapper
-command-line =
-   {{ proftpd_bin }} --nodaemon --config ${proftpd-config-file:rendered}
-wrapper-path = ${directory:service}/proftpd
-
-[proftpd-listen-promise]
-<= check-port-listening-promise
-hostname = ${proftpd:ipv6}
-port = ${proftpd:sftp-port}
-
-
-[auth-user-file]
-recipe = plone.recipe.command
-output = ${directory:etc}/ftpd.passwd
-command =
-  echo ${proftpd-password:passwd} | {{ ftpasswd_bin }} --stdin --passwd --name=${proftpd-password:username} --home=${proftpd:data-dir} --shell=/bin/false --uid=`id -u` --gid=`id -g` --file ${:output}
-update-command = ${:command}
-
-
-[ssh-keygen-base]
-recipe = plone.recipe.command
-output = ${directory:etc}/${:_buildout_section_name_}
-command = {{ ssh_keygen_bin }} -f ${:output} -N '' ${:extra-args}
-
-[ssh-host-rsa-key]
-<=ssh-keygen-base
-extra-args=-t rsa
-[ssh-host-dsa-key]
-<=ssh-keygen-base
-extra-args=-t dsa
-[ssh-host-ecdsa-key]
-<=ssh-keygen-base
-extra-args=-t ecdsa -b 521
-
-
-[proftpd-config-file]
-<= config-file
 context =
-  section proftpd proftpd
   key slapparameter_dict slap-configuration:configuration
-
-[promises]
-recipe =
-instance-promises =
-  ${proftpd-listen-promise:path}
-
-[publish-connection-parameter]
-recipe = slapos.cookbook:publish
-url = ${proftpd:url}
-user = ${proftpd-password:username}
-password = ${proftpd-password:passwd}
+  raw software_parts_directory {{ buildout['parts-directory'] }}
+  raw proftpd_bin {{ proftpd_bin }}
+  raw ftpasswd_bin {{ ftpasswd_bin }}
+  raw ftpdctl_bin {{ ftpdctl_bin }}
+  raw ssh_keygen_bin {{ ssh_keygen_bin }}
+  raw perl_bin {{ perl_bin }}
+
+[instance-default]
+<= instance-template
+template = {{ instance_default }}
+
+[switch-softwaretype]
+recipe = slapos.cookbook:switch-softwaretype
+# XXX Jerome: what is this override for ?
+override = {{ dumps(override_switch_softwaretype |default) }}
+default = instance-default:rendered
+# BBB
+RootSoftwareInstance = ${:default}

software/proftpd/software.cfg

@@ -21,6 +21,8 @@ mode = 0644
 [proftpd-config-file]
 <= download-file-base
 
+[instance-default]
+<= download-file-base
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
@@ -30,9 +32,12 @@ mode = 0644
 extensions = jinja2.ext.do
 context =
   section buildout buildout
+  key instance_default instance-default:target
   key proftpd_bin proftpd-output:proftpd
   key ftpasswd_bin proftpd-output:ftpasswd
+  key ftpdctl_bin proftpd-output:ftpdctl
   key ssh_keygen_bin openssh-output:keygen
+  key perl_bin openssh-output:keygen
 
 
 [versions]