Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CHEF
cookbooks
foswiki
Commits
af792921
Commit
af792921
authored
Nov 05, 2020
by
André Kerkhoff
Browse files
Enable foswiki_dir('log')
parent
2bd96a7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
attributes/default.rb
View file @
af792921
...
...
@@ -26,6 +26,7 @@ default['foswiki']['config']['Htpasswd']['FileName'] =
'$Foswiki::cfg{DataDir}/.htpasswd'
default
[
'foswiki'
][
'config'
][
'Htpasswd'
][
'GlobalCache'
]
=
false
default
[
'foswiki'
][
'config'
][
'LocalesDir'
]
=
'{install}/locale'
default
[
'foswiki'
][
'config'
][
'Log'
][
'Dir'
]
=
'$Foswiki::cfg{WorkingDir}/logs'
default
[
'foswiki'
][
'config'
][
'PubDir'
]
=
'{install}/pub'
default
[
'foswiki'
][
'config'
][
'PubUrlPath'
]
=
'/pub'
default
[
'foswiki'
][
'config'
][
'ScriptDir'
]
=
'{install}/bin'
...
...
libraries/helper.rb
View file @
af792921
...
...
@@ -7,7 +7,11 @@ module Foswiki
def
foswiki_dir
(
name
,
node_obj
=
nil
)
node_obj
||=
node
return
node_obj
[
'foswiki'
][
'install_dir'
]
if
name
.
eql?
'install'
dir
=
node_obj
[
'foswiki'
][
'config'
][
"
#{
name
.
capitalize
}
Dir"
]
dir
=
if
name
.
eql?
'log'
node_obj
[
'foswiki'
][
'config'
][
'Log'
][
'Dir'
]
else
node_obj
[
'foswiki'
][
'config'
][
"
#{
name
.
capitalize
}
Dir"
]
end
return
nil
if
dir
.
nil?
dir
.
gsub
(
/{install}/
,
node_obj
[
'foswiki'
][
'install_dir'
])
end
...
...
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