diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.hbm.xml b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.hbm.xml index a44145b..4dcaf34 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.hbm.xml @@ -26,6 +26,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java index 2e055a3..25d9e11 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java @@ -28,6 +28,7 @@ public class ConfigFile extends BaseDomainHelper { private ConfigFileName configFileName; private ConfigFileState configFileState; private ConfigRevision latestConfigRevision; + private Boolean autoDeploy; /** @@ -70,6 +71,23 @@ public class ConfigFile extends BaseDomainHelper { } /** + * Getter for autoDeploy + * @return Do we automatically deploy this file to the client on clreate or modify? + */ + public Boolean getAutoDeploy() { + return this.autoDeploy; + } + + /** + * Setter for autoDeploy + * @param autoDeployIn to set + */ + public void setAutoDeploy(Boolean autoDeployIn) { + this.autoDeploy = autoDeployIn; + } + + /** + * @return Returns the configChannel. */ public ConfigChannel getConfigChannel() { diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java index 0efe595..a418439 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java @@ -65,10 +65,11 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { public static final String REV_BINARY = "binary"; public static final String REV_UPLOAD = "cffUpload"; - public static final String REV_EDITABLE = "editable"; - public static final String REV_DISPLAYABLE = "displayable"; - public static final String REV_TOOLARGE = "toolarge"; + public static final String REV_EDITABLE = "editable"; + public static final String REV_DISPLAYABLE = "displayable"; + public static final String REV_TOOLARGE = "toolarge"; + public static final String AUTODEPLOY = "autoDeploy"; public static final String DEFAULT_CONFIG_DELIM_START = "{|"; public static final String DEFAULT_CONFIG_DELIM_END = "|}"; @@ -85,6 +86,7 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { set(ConfigFileForm.REV_GID, "root"); set(ConfigFileForm.REV_FILETYPE, ConfigFileType.FILE); setBinary(false); + set(ConfigFileForm.AUTODEPLOY, true); String macroStart = Config.get().getString("web.config_delim_start", DEFAULT_CONFIG_DELIM_START); @@ -248,8 +250,6 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { String ft = getString(ConfigFileForm.REV_FILETYPE); return ConfigFileType.lookup(ft); } - - /** * sets if the file is a binary or text. @@ -261,6 +261,14 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { /** * + * @return true if this file has autoDeploy set + */ + private boolean isAutoDeploy() { + return Boolean.TRUE.equals(get(AUTODEPLOY)); + } + + /** + * * @return true if this holds a dir, returns false if it holds a file.. */ private boolean isDirectory() { @@ -307,6 +315,7 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { } data.setMacroStart(getString(REV_MACROSTART)); data.setMacroEnd(getString(REV_MACROEND)); +// data.setAutoDeploy(getBoolean("autoDeploy")); } data.setPath(getString(REV_PATH)); data.setGroup(getString(REV_GID)); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 001f6da..8845c87 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -13622,6 +13622,12 @@ centrally-managed configuration channel, {2}; below is a list of systems you may /rhn/configuration/FileDetails.do + +<strong>Tip:</strong> Setting this will automatically deploy the file to all systems that have this file subscribed. + + /rhn/configuration/FileDetails.do + + <strong>Tip:</strong> A full listing of the available macros is listed in the <a href="{0}">RHN Reference Guide</a>. @@ -13970,6 +13976,12 @@ _Download /etc/sysconfig/rhn/up2date_ (Revision 7, 96 bytes) /rhn/configuration/file/FileDetails.do + +Auto Deploy: + + /rhn/configuration/file/FileDetails.do + + Ownership: diff --git a/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java b/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java index 0bed30f..547e1a8 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java @@ -25,7 +25,6 @@ import com.redhat.rhn.domain.config.ConfigRevision; import com.redhat.rhn.domain.config.ConfigurationFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.configuration.file.ConfigFileData; - import java.io.IOException; diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index 51233a1..7591e1a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -42,6 +42,12 @@ key="filedetails.jsp.tip.permissions" /> + +
+ + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf index 13a20c7..8599842 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf @@ -47,6 +47,12 @@ + + +
+ + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf index 054aadc..05b991d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf @@ -53,4 +53,10 @@ + + + + + + diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index d452151..d7060e9 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -858,6 +858,7 @@ + diff --git a/schema/spacewalk/rhnsat/tables/rhnConfigFile.sql b/schema/spacewalk/rhnsat/tables/rhnConfigFile.sql index 639699a..286fb20 100644 --- a/schema/spacewalk/rhnsat/tables/rhnConfigFile.sql +++ b/schema/spacewalk/rhnsat/tables/rhnConfigFile.sql @@ -39,6 +39,10 @@ create table rhnConfigFile -- constraint rhn_conffile_lcrid_fk -- references rhnConfigRevision(id) , + auto_deploy char(1) default('N') + constraint rhn_conffile_auto_deploy_cc not null + constraint rhn_conffile_auto_deploy_ck + check (auto_deploy in ('Y','N')), state_id number constraint rhn_conffile_sid_nn not null constraint rhn_conffile_sid_fk