abilian: publish ipv6 url, better pw

software/abilian/extranet_spr/instance-postgres.cfg.in

@@ -30,7 +30,7 @@ ipv4 = $${instance-parameters:ipv4}
 ipv4-netmask-bits = 0
 ipv6-random = $${instance-parameters:ipv6-random}
 superuser = postgres
-password = $${gen-passwd:passwd}
+password = $${postgres-passwd:passwd}
 port = 5432
 dbname = db
 # pgdata_directory is created by initdb, and should not exist beforehand.
@@ -43,7 +43,7 @@ services = $${directories:services}
 #--
 #-- Generates a random password and stores it in the filesystem
 
-[gen-passwd]
+[postgres-passwd]
 recipe = slapos.cookbook:generate.password
 storage-path = $${directories:srv}/postgres_passwd
 bytes = 16
@@ -78,15 +78,6 @@ link-binary =
     ${postgresql91:location}/bin/vacuumdb
 
 
-#----------------
-#--
-#-- Publish instance parameters.
-
-[publish]
-recipe = slapos.cookbook:publish
-url = $${postgres-instance:url}
-
-
 #----------------
 #--
 #-- Fetches parameters defined in SlapOS Master for this instance

software/abilian/extranet_spr/instance-redis.cfg.in

@@ -7,8 +7,8 @@ parts =
 
 [redis-passwd]
 recipe = slapos.cookbook:generate.password
-storage-path = $${directories:etc}/.redis-passwd
-bytes = 4
+storage-path = $${directories:etc}/redis_passwd
+bytes = 16
 
 [redis]
 recipe = slapos.cookbook:redis.server
@@ -24,13 +24,13 @@ log_file = $${directories:log}/redis.log
 wrapper = $${directories:services}/redis_server
 promise_wrapper = $${directories:promises}/redis
 
-# Send informations to SlapOS Master
-[publish-redis-connection-parameters]
-recipe = slapos.cookbook:publish
-redis_ip = $${redis:ipv6}
-redis_port = $${redis:port}
-redis_passwd = $${redis:passwd}
-redis_uses_password = $${redis:use_passwd}
+## Send informations to SlapOS Master
+#[publish-redis-connection-parameters]
+#recipe = slapos.cookbook:publish
+#redis_ip = $${redis:ipv6}
+#redis_port = $${redis:port}
+#redis_passwd = $${redis:passwd}
+#redis_uses_password = $${redis:use_passwd}
   
 [slap-parameter]
 use_passwd = false

software/abilian/extranet_spr/instance.cfg.in

@@ -25,7 +25,6 @@ parts =
     request-web-frontend
     publish-connection-parameters
     redis
-    publish-redis-connection-parameters
 
 
 
@@ -90,11 +89,12 @@ name = Web Frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 slave = true
 config = url
-config-url = https://[$${instance-parameters:ipv6}]:5000/
+config-url = https://[$${instance-parameters:ipv6-random}]:$${extranet-promise:port}/
 return = site_url
 
 
 [publish-connection-parameters]
 recipe = slapos.cookbook:publish
 url = $${request-web-frontend:connection-site_url}
+ipv6_url = http://[$${instance-parameters:ipv6-random}]:$${extranet-promise:port}/
 name = test parameter