Upgrade formula to standards #2
Conversation
| - source: {{ files_switch( | ||
| salt['config.get']( | ||
| tplroot ~ ':tofs:files:lighttpd_config', | ||
| ['/etc/lighttpd/lighttpd.conf', '/etc/lighttpd/lighttpd.conf.jinja'] |
There was a problem hiding this comment.
This is the default template. Since you're only using /etc/lighttpd/lighttpd.conf in the repo, /etc/lighttpd/lighttpd.conf.jinja can be removed.
|
@aboe76 That's the eyeball review done. I'll see if I can get a chance to test it at my end as well, a bit later on. |
| # This is unnecessary in most cases; there are sensible defaults. | ||
| # path_prefix: template_alt | ||
| # dirs: | ||
| # files: files_alt |
There was a problem hiding this comment.
Something has been bothering me about this files and the files below. I'd like to change the name of one of these across all of the new TOFS before they become too widely used. I think the bottom one should be changed to templates. Is it too late to do this across the formulas where we've started using this?
| # dirs: | ||
| # files: files_alt | ||
| # default: default_alt | ||
| # files: |
There was a problem hiding this comment.
This is the files that I believe should be changed. Otherwise, there could be confusion between the two.
There was a problem hiding this comment.
there is a difference: the first files is just the name of the folder where the files lives.
a bether name could be folder? or dir,
I guess it the same with the other formulas, we use files in which we house files and templates, other configuration tools use separate places, one files one templates
|
@aboe76 Here's the diff of --- before
+++ after
@@ -3,6 +3,43 @@
"conf_enabled": "/etc/lighttpd/conf-enabled",
"conf_use_symlink": true,
"config": "lighttpd.conf",
+ "extra_packages": [],
+ "lookup": {
+ "conf_available": "/etc/lighttpd/conf-available",
+ "conf_enabled": "/etc/lighttpd/conf-enabled",
+ "conf_use_symlink": true,
+ "config": "lighttpd.conf",
+ "package": "lighttpd",
+ "service": "lighttpd"
+ },
+ "modules": {
+ "disabled": [
+ "accesslog",
+ "auth",
+ "cgi",
+ "debian-doc",
+ "dir-listing",
+ "evasive",
+ "evhost",
+ "expire",
+ "extforward",
+ "fastcgi",
+ "fastcgi-php",
+ "flv-streaming",
+ "no-www",
+ "proxy",
+ "rrdtool",
+ "simple-vhost",
+ "ssi",
+ "ssl",
+ "status",
+ "userdir",
+ "usertrack"
+ ],
+ "enabled": [
+ "javascript-alias"
+ ]
+ },
"package": "lighttpd",
"service": "lighttpd"
}Please confirm that's what you expected. It looks like it is. Other than that, I need your answer about the |
|
@myii the diff looks good. |
|
@aboe76 What's the right solution about
Leave this as-is? That can easily lead to confusion. Which one should change? |
|
@myii it's already confusing for me too, what's the point of the first files |
|
@aboe76 Are you available on Matrix, it will be easier to resolve this there. |
|
@aboe76 Thanks for this. We'll fix TOFS in a subsequent PR, as we've just discussed on Matrix. |
Added tofs pattern from template-formula
Improved map.jinja and defaults
Improved README.rst fix small errors
Improved tofs_pattern.rst
updated sls files with tplroot dir
added the ability to add extra_packages.