Commit 475e1caf authored by Lu Xu's avatar Lu Xu 👀

software/hugo: remove unnecessary stuff

parent edb35dcd
......@@ -15,4 +15,4 @@
[instance-cfg]
filename = instance.cfg.in
md5sum = 7d2365e488bdfaecb31970ab0261bc81
md5sum = f74bf611c2ab7f27a82f34403b91ee16
[buildout]
parts =
publish-connection-parameter
stat-password
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
......@@ -10,7 +9,7 @@ offline = true
[publish-connection-parameter]
recipe = slapos.cookbook:publish
url = https://[$${hugo-wrapper:ip}]:$${hugo-wrapper:port}
url = http://[$${hugo-wrapper:ip}]:$${hugo-wrapper:port}
env = ${gowork:env.sh}
#admin-user = $${admin-password:username}
#admin-password = $${admin-password:passwd}
......@@ -22,7 +21,6 @@ partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
configuration.ice-servers.json = [{"urls":["stun:turn-paris-rapidspace.api.nexedi.net:443"]}]
[directory]
recipe = slapos.cookbook:mkdirectory
......@@ -35,8 +33,6 @@ run = $${:var}/run
services = $${:etc}/service
data = $${:srv}/data
groups = $${:srv}/groups
recordings = $${:srv}/recordings
[hugo-ssl]
recipe = plone.recipe.command
......@@ -46,33 +42,6 @@ command = ${openssl:location}/bin/openssl req -newkey rsa:2048 -batch -new -x509
update-command =
stop-on-error = true
[admin-password]
recipe = slapos.cookbook:generate.password
storage-path = $${directory:data}/.passwd
username = admin
[stat-password]
recipe = slapos.recipe.template:jinja2
template = inline:
$${admin-password:username}:$${admin-password:passwd}
rendered = $${directory:data}/passwd
[ice-servers.json]
recipe = slapos.recipe.template:jinja2
template = inline:
$${slap-configuration:configuration.ice-servers.json}
rendered = $${directory:data}/ice-servers.json
[groups-json]
recipe = slapos.recipe.template:jinja2
template = inline:{
"public":true,
"op": [{"username":"$${admin-password:username}","password":"$${admin-password:passwd}"}],
"other": [],
"presenter": [{"username": "", "password": "nexedi"}]
}
rendered = $${directory:groups}/public.json
[hugo-wrapper]
recipe = slapos.recipe.template:jinja2
port = 1313
......@@ -83,14 +52,8 @@ template =
ulimit -n $(ulimit -Hn)
exec ${gowork:bin}/hugo \
-static ${hugo-get:location}/static \
-recordings $${directory:recordings} \
-groups $${directory:groups} \
-data $${directory:data} \
-http [$${:ip}]:$${:port} \
-turn ""
rendered = $${directory:services}/hugo
depends =
$${ice-servers.json:recipe}
$${groups-json:recipe}
$${hugo-ssl:recipe}
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