Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Matevz Golob
slapos
Commits
caccbca0
Commit
caccbca0
authored
Jun 21, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fluentd: clean up
parent
d7a6490b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
23 deletions
+10
-23
software/fluentd/fluentd-agent.conf.jinja2.in
software/fluentd/fluentd-agent.conf.jinja2.in
+0
-2
software/fluentd/instance.cfg.in
software/fluentd/instance.cfg.in
+7
-7
software/fluentd/software.cfg
software/fluentd/software.cfg
+3
-14
No files found.
software/fluentd/fluentd-agent.conf.jinja2.in
deleted
100644 → 0
View file @
d7a6490b
{% set conf_text = slapparameter_dict.get('conf_text', '') -%}
{{ conf_text }}
\ No newline at end of file
software/fluentd/instance.cfg.in
View file @
caccbca0
[buildout]
[buildout]
parts =
parts =
directory
service-fluentd
service-fluentd
fluentd-agent-conf
eggs-directory = {{ buildout['eggs-directory'] }}
eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
...
@@ -32,14 +30,16 @@ recipe = slapos.cookbook:wrapper
...
@@ -32,14 +30,16 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/fluentd-service
wrapper-path = ${directory:service}/fluentd-service
command-line = {{ fluentd_location }}/bin/fluentd
command-line = {{ fluentd_location }}/bin/fluentd
-v
-v
-c ${
directory:etc}/fluentd-agent.conf
-c ${
fluentd-agent-conf:rendered}
environment =
environment =
GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
[fluentd-agent-conf]
[fluentd-agent-conf]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = {{ fluentd_conf }}/fluentd-agent.conf.jinja2.in
template = inline:{% raw -%}
rendered = ${buildout:directory}/etc/fluentd-agent.conf
{{ slapparameter_dict.get('conf_text', '') }}
{%- endraw %}
rendered = ${directory:etc}/fluentd-agent.conf
mode = 0644
mode = 0644
context =
context =
key slapparameter_dict instance-parameter:configuration
key slapparameter_dict instance-parameter:configuration
software/fluentd/software.cfg
View file @
caccbca0
[buildout]
[buildout]
extends =
extends =
../../component/fluentd/buildout.cfg
../../component/fluentd/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
parts =
parts =
fluentd
fluentd-agent-conf
instance-profile
instance-profile
slapos-cookbook
slapos-cookbook
...
@@ -18,15 +15,7 @@ mode = 0644
...
@@ -18,15 +15,7 @@ mode = 0644
extensions = jinja2.ext.do
extensions = jinja2.ext.do
context =
context =
section buildout buildout
section buildout buildout
raw fluentd_location ${fluentd:location}
key fluentd_location fluentd:location
raw fluentd_conf ${buildout:directory}
[fluentd-agent-conf]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/fluentd-agent.conf.jinja2.in
#md5sum = 4b81ddcbe2f16d23013caac37151d396
output = ${buildout:directory}/fluentd-agent.conf.jinja2.in
mode = 0644
[fluentd]
[fluentd]
gems +=
gems +=
...
...
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