Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
882ad698
Commit
882ad698
authored
Jan 27, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack-monitor: now can define a default webpage. Default is settings.cgi
parent
fba78dbb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
stack/monitor/monitor.cfg.in
stack/monitor/monitor.cfg.in
+1
-0
stack/monitor/webfiles/index.cgi.in
stack/monitor/webfiles/index.cgi.in
+1
-1
stack/monitor/webfiles/index.html.jinja2
stack/monitor/webfiles/index.html.jinja2
+1
-1
No files found.
stack/monitor/monitor.cfg.in
View file @
882ad698
...
@@ -92,6 +92,7 @@ context =
...
@@ -92,6 +92,7 @@ context =
raw index_template $${deploy-index-template:location}/$${deploy-index-template:filename}
raw index_template $${deploy-index-template:location}/$${deploy-index-template:filename}
key password zero-parameters:monitor-password
key password zero-parameters:monitor-password
raw extra_eggs_interpreter ${buildout:directory}/bin/${extra-eggs:interpreter}
raw extra_eggs_interpreter ${buildout:directory}/bin/${extra-eggs:interpreter}
raw default_page /index.cgi?script=$${monitor-parameters:knowledge0-cgi}%2F$${deploy-settings-cgi:filename}
[deploy-index-template]
[deploy-index-template]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
...
stack/monitor/webfiles/index.cgi.in
View file @
882ad698
...
@@ -108,4 +108,4 @@ else:
...
@@ -108,4 +108,4 @@ else:
else:
else:
html_base = jinja2.Template(open('{{ index_template }}').read())
html_base = jinja2.Template(open('{{ index_template }}').read())
print
print
print html_base.render(tree=make_menu())
print html_base.render(tree=make_menu()
, default_page="{{ default_page }}"
)
stack/monitor/webfiles/index.html.jinja2
View file @
882ad698
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</div>
</div>
</div>
</div>
<div
id=
"content"
>
<div
id=
"content"
>
<iframe
src=
"
/index.cgi
"
>
<iframe
src=
"
{{ default_page }}
"
>
</iframe>
</iframe>
</div>
</div>
</body>
</body>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment