Skip to content

Commit

Permalink
Fixes #13999: Cleanup reporting from rudder-techniques
Browse files Browse the repository at this point in the history
  • Loading branch information
amousset committed Dec 18, 2018
1 parent 231f7d7 commit 62c8334
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 423 deletions.
6 changes: 0 additions & 6 deletions techniques/system/common/1.0/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<FILE name="internal-security.cf">
<INCLUDED>true</INCLUDED>
</FILE>
<FILE name="rudder-stdlib.cf">
<INCLUDED>true</INCLUDED>
</FILE>
<FILE name="rudder-stdlib-core.cf">
<INCLUDED>true</INCLUDED>
</FILE>
<FILE name="check-zypper.cf">
<INCLUDED>true</INCLUDED>
</FILE>
Expand Down
26 changes: 24 additions & 2 deletions techniques/system/common/1.0/promises.st
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ bundle agent startup
action => immediate;
}

# startExecution and endExecution have migrated to rudder-stdlib-core.st

##########################################################
# Check for "disable-agent" file and cleanly stop and
# warn about this if it is present
Expand Down Expand Up @@ -760,3 +758,27 @@ bundle edit_line ensure_rsyslogd_on_suse
}
&endif&
#
# Insert the standard Rudder disclaimer into a file
#
bundle edit_line rudder_common_disclaimer
{
vars:
"file_edit_header" string => "${rudder_parameters.rudder_file_edit_header}";
defaults:
"file_edit_header" string => "#############################################################
### This file is protected by your Rudder infrastructure. ###
### Manually editing the file might lead your Rudder ###
### infrastructure to change back the server's ###
### configuration and/or to raise a compliance alert. ###
#############################################################
",
if_match_regex => "${const.dollar}{rudder_parameters.rudder_file_edit_header}";
insert_lines:
"${file_edit_header}"
location => start,
insert_type => "preserve_block";
}
285 changes: 0 additions & 285 deletions techniques/system/common/1.0/rudder-stdlib-core.cf

This file was deleted.

Loading

0 comments on commit 62c8334

Please sign in to comment.