rsync component

software/mioga/instance-apacheperl.cfg

@@ -33,12 +33,6 @@ crontabs = $${rootdirectory:etc}/crontabs/
 sshkeys = $${rootdirectory:srv}/sshkeys
 ssh = $${rootdirectory:etc}/ssh
 
-[gen-passwd]
-recipe = slapos.cookbook:generate.password
-storage-path = $${rootdirectory:etc}/pw
-bytes = 8
-default = $${slap-parameter:password}
-
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
 wrapper = $${rootdirectory:bin}/cron_simplelogger
@@ -68,11 +62,12 @@ port = $${apacheperl-instance:port}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-apacheperl_url = http://[$${slap-network-information:global-ipv6}]:$${mioga-instance:public_ipv6_port}
-admin_password = $${mioga-instance:admin_password}
+direct_url = $${mioga-url:direct_url}
 ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
+url = $${request-frontend:connection-site_url}
+
+# Request POSTGRES INSTANCE and parse its URL
 
-# Request Postgres instance and parse its URL
 [request-postgres]
 <= slap-connection
 recipe = slapos.cookbook:request
@@ -92,6 +87,8 @@ recipe = cns.recipe.symlink
 symlink_target = $${rootdirectory:bin}
 symlink_base = ${postgresql:location}/bin
 
+# SSH SERVER
+
 [sshkeys-directory]
 recipe = slapos.cookbook:mkdirectory
 requests = $${basedirectory:sshkeys}/requests/
@@ -133,6 +130,21 @@ key = $${slap-parameter:authorized-key}
 # Default value if no ssh key is specified
 authorized-key =
 
+# IPv4 AND PORT 80 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 = $${mioga-url:direct_url}
+return = site_url
+
+# MIOGA INSTANCE
+
 [mioga-instance]
 recipe = slapos.cookbook:mioga.instantiate
 # mioga_compile_dir = ${template-apacheperl:compile-directory}
@@ -170,4 +182,6 @@ access_log = $${rootdirectory:log}/access.log
 bin_dir = $${rootdirectory:bin}
 log_dir = $${rootdirectory:log}
 site_perl = ${perl:siteprefix}
-admin_password = initial_nonsense
+
\ No newline at end of file
+[mioga-url]
+direct_url = http://[$${slap-network-information:global-ipv6}]:$${mioga-instance:public_ipv6_port}
\ No newline at end of file