forked from HEP-Puppet/perfsonar
-
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.
Add hacks to prevent the module from failing after 4.0 upgrade.
The changes prevent the module from failing after an upgrade to perfsonar 4.0. The module cannot be used to configure a fresh 4.0 installation.
- Loading branch information
Showing
8 changed files
with
84 additions
and
28 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
--- dist/httpd.aug.org 2017-04-28 11:17:04.010737996 +0100 | ||
+++ dist/httpd.aug 2017-04-28 11:27:57.115688414 +0100 | ||
@@ -34,6 +34,9 @@ | ||
|
||
*) | ||
|
||
+(* | ||
+# puppet perfsonar::patches applied patch: 03_augeas_httpd.patch | ||
+*) | ||
|
||
module Httpd = | ||
|
||
@@ -63,13 +66,14 @@ | ||
let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/ | ||
let dquot = /"([^"\\\r\n]|\\\\.)*"/ | ||
let squot = /'([^'\\\r\n]|\\\\.)*'/ | ||
+let comp = /[<>=]?=/ | ||
|
||
(****************************************************************** | ||
* Attributes | ||
*****************************************************************) | ||
|
||
let arg_dir = [ label "arg" . store (char_arg_dir+|dquot|squot) ] | ||
-let arg_sec = [ label "arg" . store (char_arg_sec+|dquot|squot) ] | ||
+let arg_sec = [ label "arg" . store (char_arg_sec+|comp|dquot|squot) ] | ||
|
||
let argv (l:lens) = l . (sep_spc . l)* | ||
|
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
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,6 +1,8 @@ | ||
class perfsonar::logrotate_all { | ||
include 'perfsonar::logrotate' | ||
include 'perfsonar::regular_testing::logrotate' | ||
if $::perfsonar_version and versioncmp($::perfsonar_version, '4.0') < 0 { | ||
include 'perfsonar::regular_testing::logrotate' | ||
} | ||
include 'perfsonar::ls_registration_daemon::logrotate' | ||
include 'perfsonar::ls_cache_daemon::logrotate' | ||
} |
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