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.

Sign up for GitHub

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

Jump to bottom

Fixes #7240: The rudder_var path on Solaris is incorrect #788

Merged
merged 1 commit into from
Nov 26, 2015
Merged

Fixes #7240: The rudder_var path on Solaris is incorrect #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions initial-promises/node-server/common/1.0/site.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ bundle common g
"rudder_ncf" string => "${rudder_var}/ncf";
"crontab" string => "/etc/crontab";

# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies" string => "${rudder_var}/tools";

windows::
"rudder_base" string => "${sys.winprogdir}\Rudder";
"rudder_bin" string => "${rudder_base}\bin";
Expand Down Expand Up @@ -103,9 +100,6 @@ bundle common g
};


# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies" string => "${rudder_sbin}";

"uuid_file" string => "${rudder_base}\etc\uuid.hive";
"rudder_disable_agent_file" string => "${rudder_base}\etc\disable-agent";

Expand Down Expand Up @@ -145,9 +139,6 @@ bundle common g

"server_roles_path" string => "${rudder_base}/etc/server-roles.d/";

# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies_origin" string => "/var/rudder/tools";

# The time at which the execution started
windows.!cygwin::
"execRun" string => execresult("\"${g.rudder_sbin}\getDate.bat\"", "noshell");
Expand Down
5 changes: 1 addition & 4 deletions initial-promises/node-server/failsafe.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ bundle common g
!windows.!android::
"rudder_base" string => "/opt/rudder";

solaris::
"rudder_var" string => "/opt/rudder/var";

!windows.!solaris.!android::
!windows.!android::
"rudder_var" string => "/var/rudder";

!windows::
Expand Down
5 changes: 1 addition & 4 deletions techniques/system/common/1.0/failsafe.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ bundle common g
!windows.!android::
"rudder_base" string => "/opt/rudder";

solaris::
"rudder_var" string => "/opt/rudder/var";

!windows.!android.!solaris::
!windows.!android::
"rudder_var" string => "/var/rudder";

!windows::
Expand Down
9 changes: 0 additions & 9 deletions techniques/system/common/1.0/site.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ bundle common g
"crontab" string => "/etc/crontab";
"gzip" string => "/bin/gzip";

# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies" string => "${rudder_var}/tools";

windows::
"rudder_base" string => "${sys.winprogdir}\Rudder";
"rudder_bin" string => "${rudder_base}\bin";
Expand Down Expand Up @@ -105,9 +102,6 @@ bundle common g
};


# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies" string => "${rudder_sbin}";

aix::

"gzip" string => "/usr/bin/gzip";
Expand Down Expand Up @@ -154,9 +148,6 @@ bundle common g
"rudder_tools_updated_origin" string => "${rudder_tools_origin}/${rudder_tools_updated_filename}";
"rudder_tools_updated" string => "${rudder_tools}/${rudder_tools_updated_filename}";

# DEPRECATED: This variable is used in pre-2.9 Techniques.
"rudder_dependencies_origin" string => "/var/rudder/tools";

# The time at which the execution started
windows.!cygwin::
"execRun" string => execresult("\"${g.rudder_sbin}\getDate.bat\"", "noshell");
Expand Down
4 changes: 2 additions & 2 deletions techniques/system/inventory/1.0/fusionAgent.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ bundle common inventory
android::
"cpuid_tool" string => "${g.rudder_tools}/cpuid-android-V1.0.sh";

!aix.!windows.!android::
!aix.!windows.!android.!solaris::
"cpuid_tool" string => "${g.rudder_tools}/cpuid-linux-V1.0.sh";
Copy link
Member Author

Choose a reason for hiding this comment

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

This does not have an equivalent in initial promises


any::
Expand Down Expand Up @@ -365,7 +365,7 @@ bundle agent generateExtraInformations

pass3.(!rudder_inventory_cpuid_tool_present)::

"any" usebundle => rudder_common_report("Inventory", "log_debug", "&TRACKINGKEY&", "inventory", "None", "The CPUID generation tool is not present yet. Skipping...");
"any" usebundle => rudder_common_report("Inventory", "log_debug", "&TRACKINGKEY&", "inventory", "None", "CPUID generation tool not available for this platform, or not present yet. Skipping...");

commands:

Expand Down