Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contrib2 #222

Closed
wants to merge 30 commits into from
Closed

Contrib2 #222

wants to merge 30 commits into from

Conversation

CedricCabessa
Copy link
Contributor

This is an update of the previous PR: #186

Matthieu CERDA and others added 30 commits January 28, 2013 11:09
…e 3.4, and fixed the android system settings techniques with values wanted for the demo
…uese and the screen resolution changing method
mobile devices are rarely registered in DNS.
…droid_support_2.5

skipidentify for android
Android version of run-inventory is available in the cfengine android repo
The behavior is supposed to be the same even if some arguments are ignored (for now)
Add a rudder_curl var to factorise code
add android when it just works
OCSInventory does not support ACCESSLOG (but fusioninventory does)
We add this node in cfengine. An possible improvement is to check for the
existence of this node before adding it in order to be compatible with
fusioninventory
We cannot use after_location("<CONTENT>") because it is already used with add_information_*.
According to doc this do not converge (we sometime observe 2 ACCESSLOG tag).
We simply use another tag (OPERATINGSYSTEM) in the same hierarchy.
…droid_support_2.5

Branches/rudder/android support 2.5
Conflicts:
	initial-promises/node-server/common/1.0/site.cf
	initial-promises/node-server/failsafe.cf
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
	initial-promises/node-server/promises.cf
	techniques/fileConfiguration/fileManagement/1.0/manageFilesAndFolders.st
	techniques/fileConfiguration/fileManagement/1.1/manageFilesAndFolders.st
	techniques/fileDistribution/checkGenericFileContent/1.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/2.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/2.1/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.1/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.2/checkGenericFileContent.st
	techniques/fileDistribution/copyGitFile/1.1/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.2/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.3/copyFileFromSharedFolder.st
	techniques/fileDistribution/downloadFile/1.0/downloadFile.st
	techniques/jobScheduling/jobScheduler/1.0/job_scheduler.st
	techniques/system/common/1.0/failsafe.st
	techniques/system/common/1.0/promises.st
	techniques/system/common/1.0/site.st
	techniques/system/inventory/1.0/fusionAgent.st
now that the copy is done in failsafe, we need set skipidentify here
This technique should not depend on any particular OS
Conflicts:
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
	techniques/system/inventory/1.0/fusionAgent.st
@Kegeruneku
Copy link

This PR has to be targeted to branches/rudder/2.8 before merging.

@@ -83,7 +83,7 @@ bundle agent check_generic_file_content
ifvarclass => "content_${index}_modified.execute_command_${index}.!content_${index}_failed";
reports:

(linux|windows)::
(linux|!linux)::

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd replace this with "cfengine_3::", it is much more elegant.

@Kegeruneku
Copy link

Except from the "linux|!linux::", this looks great :)

Maybe some indentation / alignment work can be done by the way.

@@ -521,7 +570,7 @@ body replace_with xmled(attribute)
body file_select inventory_files
{

(windows|linux)::
(windows|linux|android)::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it should be "any::", no?

@jooooooon
Copy link
Member

Also, could you please use ${x} for variable referencing, instead of $(x) (see http://www.rudder-project.org/foswiki/Development/TechniqueBestPractices).

"@@Common@@result_success@@hasPolicyServer-root@@common-root@@00@@CRON Daemon@@None@@${g.execRun}##${g.uuid}@#The CRON daemon is running";

android::
"@@Common@@result_success@@&TRACKINGKEY&@@CRON Daemon@@None@@$(g.execRun)##$(g.uuid)@#This is an android machine: CRON verifications skipped !";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an initial promise, so the trackingkey doesn't exist yet, the line should be
"@@common@@result_success@@hasPolicyServer-root@@common-root@@00@@Cron Daemon@@None@@${g.execRun}##${g.uuid}@#This is an android machine: CRON verifications skipped !

@CedricCabessa
Copy link
Contributor Author

squashed & feedback integrated in #234

amousset pushed a commit to amousset/rudder-techniques that referenced this pull request Dec 8, 2015
…nto_post_inst_rudder_webapp

Fixes #4484 - Fix typo into rudder-webapp post-inst for SLES
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants