-
-
Notifications
You must be signed in to change notification settings - Fork 264
add caddy support #411
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
add caddy support #411
Conversation
@@ -156,6 +165,7 @@ def default_values(): | |||
{'service_id': 4, 'service': 'Apache', 'slug': 'apache'}, | |||
{'service_id': 5, 'service': 'HA cluster', 'slug': 'cluster'}, | |||
{'service_id': 6, 'service': 'UDP listener', 'slug': 'udp'}, | |||
{'service_id': 2, 'service': 'Caddy', 'slug': 'caddy'}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
service_id must be 7, 2 is for nginx
|
||
kwargs = { | ||
'haproxy': haproxy, | ||
'nginx': nginx, | ||
'apache': apache, | ||
'ip': vip, | ||
'caddy': caddy, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you would like do caddy installation with creating HA cluster, you should write ansible role for it
@@ -12,7 +12,7 @@ def generate_exporter_inc(server_ip: str, ver: str, exporter: str) -> object: | |||
'service': f'{exporter} exporter' | |||
} | |||
|
|||
if exporter in ('haproxy', 'nginx', 'apache'): | |||
if exporter in ('haproxy', 'nginx', 'apache', 'caddy'): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you would like do caddy exporter installation, you should write ansible role for it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-->Something strange
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does caddy have the same stats page as haproxy?
@@ -22,6 +22,7 @@ | |||
<script src="/static/js/codemirror/addon/fold/comment-fold.js"></script> | |||
<script src="/static/js/codemirror/addon/scroll/annotatescrollbar.js"></script> | |||
<script src="/static/js/codemirror/mode/nginx.js"></script> | |||
<script src="/static/js/codemirror/mode/caddy.js"></script> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no caddy.js
<span class="ui-button ui-widget ui-corner-all" id="caddy_install" title="{{lang.words.install|title()}} Caddy">{{lang.words.install|title()}}</span> | ||
</td> | ||
</tr> | ||
</table> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you would like do caddy installation, you should write ansible role for it
Looks great, but there are some comments from me. Also will be great if you create update DB for caddy in the create_db.py file |
The implementation is done by copying what's done for the counterparts, but I'm having a hard time testing the changes due to #407.
Resolves #336
Keeping the PR as draft until sanity checks are done and is validated.