Commit 4f5af09f authored by Ivan Tyagov's avatar Ivan Tyagov

software/mosquitto: Implement password-based authentication ...

See merge request nexedi/slapos!1298
parents 32447daf af34e75b
Pipeline #25262 failed with stage
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 6bfa6ce34bc99511d71ef68f677c99a9 md5sum = 4c7aa7b2132dc13ddee37fb416decf81
...@@ -34,21 +34,47 @@ bin = ${:home}/bin ...@@ -34,21 +34,47 @@ bin = ${:home}/bin
[mosquitto-config-file] [mosquitto-config-file]
recipe = slapos.recipe.build recipe = slapos.recipe.build
location = ${directory:etc}/${:_buildout_section_name_}.cfg location = ${directory:etc}/${:_buildout_section_name_}.cfg
ip = ${instance-parameter:ipv4-random} ipv4 = ${instance-parameter:ipv4-random}
ipv6 = ${instance-parameter:ipv6-random}
port = 1883
password = ${mosquitto-password-file:location}
install = install =
config = open(self.options["location"], "w") config = open(self.options["location"], "w")
ip = self.options["ip"] port = self.options["port"]
config.write(f"listener 1883 {ip}\nprotocol mqtt") ipv4 = self.options["ipv4"]
ipv6 = self.options["ipv6"]
password = self.options["password"]
config.write(f"listener {port} {ipv4}\nprotocol mqtt\n\n")
config.write(f"listener {port} {ipv6}\nprotocol mqtt\n\n")
config.write(f"password_file {password}\n\n")
[mosquitto-password-file]
recipe = plone.recipe.command
location = ${directory:etc}/${:_buildout_section_name_}.txt
command =
touch ${:location}
{{ mosquitto_location }}/bin/mosquitto_passwd -b ${:location} ${mosquitto-password:username} ${mosquitto-password:passwd}
stop-on-error = true
[mosquitto-password]
recipe = slapos.cookbook:generate.password
username = mosquitto
[mosquitto-listen-promise] [mosquitto-listen-promise-ipv4]
<= check-port-listening-promise <= check-port-listening-promise
hostname = ${mosquitto-config-file:ip} hostname = ${mosquitto-config-file:ipv4}
port = 1883 port = ${mosquitto-config-file:port}
[mosquitto-listen-promise-ipv6]
<= check-port-listening-promise
hostname = ${mosquitto-config-file:ipv6}
port = ${mosquitto-config-file:port}
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
${mosquitto-listen-promise:path} ${mosquitto-listen-promise-ipv4:path}
${mosquitto-listen-promise-ipv6:path}
[mosquitto-service] [mosquitto-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -58,4 +84,7 @@ output = $${:wrapper-path} ...@@ -58,4 +84,7 @@ output = $${:wrapper-path}
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
url = mqtt://${mosquitto-listen-promise:hostname}:${mosquitto-listen-promise:port} ipv4 = mqtt://${mosquitto-config-file:ipv4}:${mosquitto-config-file:port}
ipv6 = mqtt://${mosquitto-config-file:ipv6}:${mosquitto-config-file:port}
username = ${mosquitto-password:username}
password = ${mosquitto-password:passwd}
...@@ -8,6 +8,10 @@ extends = ...@@ -8,6 +8,10 @@ extends =
parts = parts =
slapos-cookbook slapos-cookbook
instance-profile instance-profile
plone.recipe.command
[plone.recipe.command]
recipe = zc.recipe.egg
[instance-profile] [instance-profile]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment