forked from redhat-openstack/openstack-puppet-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix variable names, convert flags to bool and use bool2httpd function
- Loading branch information
1 parent
43c5c5e
commit fefaa40
Showing
4 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
GeoIPEnable <%= @enable %> | ||
GeoIPEnable <%= scope.function_bool2httpd([@enable]) %> | ||
<%- if @dbfile and ! [ false, 'false', '' ].include?(@dbfile) -%> | ||
<%- if @dbfile.kind_of?(Array) -%> | ||
<%- Array(@dbfile).each do |file| -%> | ||
<%- if @db_file and ! [ false, 'false', '' ].include?(@db_file) -%> | ||
<%- if @db_file.kind_of?(Array) -%> | ||
<%- Array(@db_file).each do |file| -%> | ||
GeoIPDBFile <%= file %> <%= @flag %> | ||
<%- end -%> | ||
<%- else -%> | ||
GeoIPDBFile <%= @dbfile %> <%= @flag %> | ||
GeoIPDBFile <%= @db_file %> <%= @flag %> | ||
<%- end -%> | ||
<%- end -%> | ||
GeoIPOutput <%= @output %> | ||
<% if @enableutf8 -%> | ||
GeoIPEnableUTF8 <%= @enableutf8 %> | ||
<% if ! @enable_utf8.nil? -%> | ||
GeoIPEnableUTF8 <%= scope.function_bool2httpd([@enable_utf8]) %> | ||
<% end -%> | ||
<% if @scanproxyheaders -%> | ||
GeoIPScanProxyHeaders <%= @scanproxyheaders %> | ||
<% if ! @scan_proxy_headers.nil? -%> | ||
GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %> | ||
<% end -%> | ||
<% if @uselastxforwarededforip -%> | ||
GeoIPUseLastXForwardedForIP <%= @uselastxforwarededforip %> | ||
<% if ! @use_last_xforwarededfor_ip.nil? -%> | ||
GeoIPUseLastXForwardedForIP <%= scope.function_bool2httpd([@use_last_xforwarededfor_ip]) %> | ||
<% end -%> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters