From bfc01a65f33f0ac51521e4c6a015034f9c7e06de Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Tue, 15 Aug 2023 15:44:51 +0200 Subject: [PATCH] Fixes #23278: Improve some messages in the interface - plugins --- Jenkinsfile | 2 +- README.adoc | 14 +- _typos.toml | 7 + ansible-policies/build.conf | 4 +- ansible-policies/packaging/postinst | 2 +- api-authorizations/README.adoc | 2 +- api-authorizations/build.conf | 4 +- .../src/main/elm/sources/UserApiToken.elm | 2 +- auth-backends/README.adoc | 4 +- auth-backends/build.conf | 6 +- .../src/main/elm/sources/AuthBackends.elm | 2 +- .../rudder/plugin/AuthBackendsConf.scala | 4 +- .../authbackends/AuthBackendsRepository.scala | 2 +- .../plugins/authbackends/DataTypes.scala | 2 +- branding/build.conf | 2 +- branding/src/main/elm/sources/View.elm | 8 +- centreon/README.adoc | 6 +- centreon/build.conf | 4 +- change-validation/README.adoc | 4 +- change-validation/build.conf | 4 +- .../{Informations.png => Information.png} | Bin .../src/main/elm/sources/Init.elm | 2 +- .../main/elm/sources/SupervisedTargets.elm | 2 +- .../src/main/elm/sources/View.elm | 6 +- .../template/ChangeValidationManagement.html | 144 +++++++++++------- .../rudder/plugin/ChangeValidationConf.scala | 4 +- .../WorkflowJdbcRepository.scala | 2 +- .../api/ChangeRequestApi.scala | 4 +- .../api/SupervisedTargetsApi.scala | 4 +- .../snippet/ChangeRequestChangesForm.scala | 4 +- .../snippet/ChangeRequestEditForm.scala | 6 +- consul/README.adoc | 4 +- consul/build.conf | 4 +- datasources/build.conf | 2 +- .../datasources/UpdateHttpDataset.scala | 2 +- glpi/build.conf | 4 +- helloworld/build.conf | 2 +- .../helloworld/service/LogAccessInDb.scala | 2 +- main-build.conf | 2 +- makefiles/common-scala-plugin.mk | 2 +- node-external-reports/README.adoc | 2 +- node-external-reports/build.conf | 2 +- .../node-external-reports.properties | 2 +- .../main/resources/nodeExternalReports.html | 4 +- .../NodeExternalReportPluginDef.scala | 2 +- .../CreateNodeDetailsExtension.scala | 2 +- .../service/ReadExternalReports.scala | 2 +- notify/build.conf | 4 +- openscap/README.adoc | 2 +- openscap/build.conf | 4 +- openscap/packaging/prerm | 2 +- .../rudder/plugin/OpenscapPoliciesConf.scala | 2 +- .../openscappolicies/api/OpenScapApi.scala | 8 +- .../OpenScapNodeDetailsExtension.scala | 4 +- .../services/OpenScapReportReader.scala | 4 +- plugins-common-private/build.conf | 2 +- plugins-common/pom-template.xml | 2 +- qa-test | 2 +- scale-out-relay/build.conf | 4 +- .../scaleoutrelay/ScaleOutRelayService.scala | 10 +- .../scaleoutrelay/api/ScaleOutRelayApi.scala | 2 +- src/main/g8/build.conf | 4 +- src/main/g8/default.properties | 2 +- .../rudder/plugin/$plugin_class$Conf.scala | 2 +- user-management/build.conf | 4 +- .../src/main/elm/sources/UserManagement.elm | 2 +- user-management/src/main/elm/sources/View.elm | 6 +- .../rudder/plugin/UserManagementConf.scala | 2 +- vault/build.conf | 4 +- zabbix/README.adoc | 2 +- zabbix/build.conf | 4 +- 71 files changed, 213 insertions(+), 174 deletions(-) rename change-validation/docs/images/{Informations.png => Information.png} (100%) diff --git a/Jenkinsfile b/Jenkinsfile index d9086afea..f62286e4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { agent { dockerfile { filename 'ci/typos.Dockerfile' - additionalBuildArgs '--build-arg VERSION=1.0' + additionalBuildArgs '--build-arg VERSION=1.16.5' } } steps { diff --git a/README.adoc b/README.adoc index 23092e10b..443f68468 100644 --- a/README.adoc +++ b/README.adoc @@ -15,14 +15,14 @@ Once `g8` command is installed (see http://www.foundweekends.org/giter8/setup.ht ``` % g8 file://. ``` -You can alos use the github resolution: +You can also use the github resolution: ``` % g8 normation/rudder-plugins ``` And answer the questions. Only the `name` is mandatory: use the plugin short name, with -space and capital if you want (see convetion below). +space and capital if you want (see convention below). Juste hitting choose the default value (the one between []). ``` @@ -50,7 +50,7 @@ minus 'rudder-plugin-" prefix. Each plugin build information are grouped in file `build.conf` in plugin root directory. -== Branch versionning and compatibility with Rudder versions +== Branch versioning and compatibility with Rudder versions Plugins are linked to Rudder patch version, so we retrieve in `rudder-plugins` the same branch @@ -64,7 +64,7 @@ corresponding Rudder patch version: - etc ``` -This scheme allows to ensure total binary compatiblity, and upgrade is done automatically by rudder package at upgrade. +This scheme allows to ensure total binary compatibility, and upgrade is done automatically by rudder package at upgrade. == Plugin version and Tag convention @@ -73,7 +73,7 @@ This scheme allows to ensure total binary compatiblity, and upgrade is done aut Plugin versions are composed in two parts separated by a `-`: - the Rudder corresponding version (including the patch number), -- the plugin own version in format X.Y(.Z) where the Z part is optionnal. +- the plugin own version in format X.Y(.Z) where the Z part is optional. For example, the `datasources` plugin, in own version 2.1, for Rudder 7.2.3 will get version: `7.2.3-2.2`. @@ -126,7 +126,7 @@ npm install -g elm To build a plugin package, do: ``` -git checkout tag-corresponding-to-plugin-vesion +git checkout tag-corresponding-to-plugin-version make clean && make generate-all-pom && make plugin-name ``` @@ -172,4 +172,4 @@ https://www.rudder.io/en/expand/contribute/ == Authors -Authors are tracked by their git name and public git hostory of the project. +Authors are tracked by their git name and public git history of the project. diff --git a/_typos.toml b/_typos.toml index 32facb09a..1b5b5a155 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,5 +1,9 @@ [default.extend-words] monitord = "monitord" +Ser = "Ser" +unser = "unser" +# False positive on the OAUTHv2 string +OAUT = "OAUT" # All exceptions below should be removed when upstream will be fixed includeSytem = "includeSytem" @@ -7,3 +11,6 @@ Sytem = "Sytem" cssPsuedoElementExclusion = "cssPsuedoElementExclusion" Psuedo = "Psuedo" criterias = "criterias" +Formater = "Formater" +Provid = "Provid" +Optionnal = "Optionnal" \ No newline at end of file diff --git a/ansible-policies/build.conf b/ansible-policies/build.conf index bc22bc6a5..07c69f8a2 100644 --- a/ansible-policies/build.conf +++ b/ansible-policies/build.conf @@ -11,7 +11,7 @@ plugin-name=ansible-policies # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""This plugin distributes a technique to run Ansible jobs from Rudder and reports their results.""" # WEB, HTML description. @@ -21,6 +21,6 @@ plugin-web-description=

This plugin distributes a technique to run Ansible job # - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.0 diff --git a/ansible-policies/packaging/postinst b/ansible-policies/packaging/postinst index b7b2af458..bd6a2cd10 100755 --- a/ansible-policies/packaging/postinst +++ b/ansible-policies/packaging/postinst @@ -4,7 +4,7 @@ PLUGIN_FULL_NAME="rudder-plugin-ansible-policies" PRETTY_NAME="Ansible Policies" CONFIGURATION_PATH=/var/rudder/packages/$PLUGIN_FULL_NAME -# Code below should be mostly comon between the plugins +# Code below should be mostly common between the plugins SOURCE_DIR=${CONFIGURATION_PATH}/techniques CONFIG_REPO=/var/rudder/configuration-repository diff --git a/api-authorizations/README.adoc b/api-authorizations/README.adoc index a91b70c82..115b1021b 100644 --- a/api-authorizations/README.adoc +++ b/api-authorizations/README.adoc @@ -23,7 +23,7 @@ You can log information about ACL (behavior and errors) by adding the following +

Rudder - Change Validation - - + + @@ -38,7 +42,7 @@

-

Change Validation Status

+

Change validation status

@@ -53,7 +57,7 @@

Change Validation Status

@@ -89,7 +93,7 @@

Change Validation Status

- + [messages] @@ -100,15 +104,21 @@

Change Validation Status

- If enabled, all change to configuration (Directives, Rules, Groups and Parameters) will be submitted for validation via a Change Request based on node targeting (configured below).
- A new Change Request will enter the Pending validation status, then can be moved to Pending deployment (approved but not yet deployed) or Deployed (approved and deployed) statuses. + If enabled, all change to configuration (directives, rules, groups and parameters) will be + submitted for validation via a change request based on node targeting (configured + below).
+ A new change request will enter the Pending validation status, then can be moved to + Pending deployment (approved but not yet deployed) or Deployed (approved and + deployed) statuses.

- If you have the user management plugin, only users with the validator or deployer roles are authorized to perform + If you have the user management plugin, only users with the validator or + deployer roles are authorized to perform these steps (see /opt/rudder/etc/rudder-users.xml).

- If disabled or if the change is not submitted to validation, the configuration will be immediately deployed. + If disabled or if the change is not submitted to validation, the configuration will be + immediately deployed.

@@ -123,25 +133,37 @@

Configure email notification

  • /var/rudder/plugins/change-validation/validation-mail.template - +
  • /var/rudder/plugins/change-validation/deployment-mail.template - +
  • /var/rudder/plugins/change-validation/cancelled-mail.template - +
  • /var/rudder/plugins/change-validation/deployed-mail.template - +
    • @@ -153,8 +175,10 @@

    Configure email notification

- By default, email notifications are disabled. To enable it make sure that the smtp.hostServer parameter is - not left empty in the configuration file: /opt/rudder/etc/plugins/change-validation.conf + By default, email notifications are disabled. To enable them, make sure that the + smtp.hostServer parameter is + not left empty in the configuration file: + /opt/rudder/etc/plugins/change-validation.conf

@@ -170,13 +194,15 @@

Configure change request triggers

-

Be careful: a change request is created when at least one predicate matches, so an exempted user +

Be careful: a change request is created when at least one predicate matches, so an + exempted user still need a change request to modify a node from a supervised group.

-

Configure Users with change validation

+

Configure users with change validation

@@ -189,49 +215,55 @@

Configure Users with change validation

- Any change done by a Validated User will be automaticaly deployed without validation needed by another user. + Any change done by a validated user will be automatically deployed without validation needed + by another user.

-

Configure Groups with Change Validations

-
-
-
-
+

Configure groups with change validations

+
+
+
+
+
+
- -
-
-
-
- +
+
+
+ +
+

+ Change validation are enable for any change that would impact a node belonging to one + of the chosen groups below. + Be careful: a change on one another group +

+

+ The supervised changes are: +

    +
  • any change in a global parameter, as these changes can have side effects spreading + technique code,
    • +
  • any modification in one of the supervised groups,
    • +
  • any change in a rule which targets a node which belong to a group marked as supervised, +
    • +
  • any change in a directive used in one of the previous rules.
    • +
+

+

+ Changes in techniques are not subjected to change validation, nor are changes resulting from + an archive import. +

-

- Change validation are enable for any change that would impact a node belonging to one of the chosen groups below. - Be careful: a change on one another group -

-

- The supervised changes are: -

    -
  • any change in a global parameter, as these changes can have side effects spreading technique code,
    • -
  • any modification in one of the supervised groups,
    • -
  • any change in a rule which targets a node which belong to a group marked as supervised,
    • -
  • any change in a directive used in one of the previous rules.
    • -
-

-

- Changes in techniques are not subjected to change validation, nor are changes resulting from an archive import. -

@@ -244,11 +276,11 @@

Configure Groups with Change Validations

- + \ No newline at end of file diff --git a/change-validation/src/main/scala/bootstrap/rudder/plugin/ChangeValidationConf.scala b/change-validation/src/main/scala/bootstrap/rudder/plugin/ChangeValidationConf.scala index d289ebe13..d3969fd27 100644 --- a/change-validation/src/main/scala/bootstrap/rudder/plugin/ChangeValidationConf.scala +++ b/change-validation/src/main/scala/bootstrap/rudder/plugin/ChangeValidationConf.scala @@ -136,7 +136,7 @@ class ChangeValidationWorkflowLevelService( } /** - * Methode to use to combine several validationNeeded check. + * Method to use to combine several validationNeeded check. * Note that a validated user will prevent workflow to be performed, no other validationNeeded check will be executed */ def combine[T]( @@ -331,7 +331,7 @@ object ChangeValidationConf extends RudderPluginModule { /* * Here, rights are not sufficiently precise: the check need to know the value * of the "status" parameter to decide if a validator (resp a deployer) can do - * what he asked for. + * what they asked for. */ override def authorizationApiMapping: AuthorizationApiMapping = new AuthorizationApiMapping { override def mapAuthorization(authz: AuthorizationType): List[ApiAclElement] = { diff --git a/change-validation/src/main/scala/com/normation/plugins/changevalidation/WorkflowJdbcRepository.scala b/change-validation/src/main/scala/com/normation/plugins/changevalidation/WorkflowJdbcRepository.scala index 864a6b301..4d49bf3b8 100644 --- a/change-validation/src/main/scala/com/normation/plugins/changevalidation/WorkflowJdbcRepository.scala +++ b/change-validation/src/main/scala/com/normation/plugins/changevalidation/WorkflowJdbcRepository.scala @@ -116,7 +116,7 @@ class WoWorkflowJdbcRepository(doobie: Doobie) extends WoWorkflowRepository with sql"""update workflow set state = ${state} where id = ${crId}""".update.run.attempt } else { val msg = s"Cannot change status of ChangeRequest '${crId.value}': it has the status '${s.value}' " + - s"but we were expecting '${from.value}'. Perhaps someone else changed it concurently?" + s"but we were expecting '${from.value}'. Perhaps someone else changed it concurrently?" ChangeValidationLogger.error(msg) (Left(msg).pure[ConnectionIO]) } diff --git a/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/ChangeRequestApi.scala b/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/ChangeRequestApi.scala index 250812b96..8739ddc5d 100644 --- a/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/ChangeRequestApi.scala +++ b/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/ChangeRequestApi.scala @@ -154,11 +154,11 @@ class ChangeRequestApiImpl( val isAcceptable = commitRepository.isMergeable(cr) restDataSerializer.serializeCR(cr, status, isAcceptable, version) } - private[this] def unboxAnswer(actionName: String, id: ChangeRequestId, boxedAnwser: Box[LiftResponse])(implicit + private[this] def unboxAnswer(actionName: String, id: ChangeRequestId, boxedAnswer: Box[LiftResponse])(implicit action: String, prettify: Boolean ) = { - boxedAnwser match { + boxedAnswer match { case Full(response) => response case eb: EmptyBox => val fail = eb ?~! (s"Could not $actionName ChangeRequest ${id}") diff --git a/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/SupervisedTargetsApi.scala b/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/SupervisedTargetsApi.scala index cf2bcbe62..7a4ba823e 100644 --- a/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/SupervisedTargetsApi.scala +++ b/change-validation/src/main/scala/com/normation/plugins/changevalidation/api/SupervisedTargetsApi.scala @@ -120,7 +120,7 @@ class SupervisedTargetsApiImpl( * * { "name": "root category" * , "targets": [ - * {"id": "group:xxxx", "name": "Some name choosed by user", "description": "", "supervised":true} + * {"id": "group:xxxx", "name": "Some name chosen by user", "description": "", "supervised":true} * , {"id": "group:xxxx", "name": "Some other group", "description": "", "supervised":false} * , ... * ] @@ -181,7 +181,7 @@ class SupervisedTargetsApiImpl( res match { case Full(x) => - RestUtils.toJsonResponse(None, JString("Set of target needing validation has beed updated"))( + RestUtils.toJsonResponse(None, JString("Set of target needing validation has been updated"))( schema.name, params.prettify ) diff --git a/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala b/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala index 3f02ec050..2d5a0289b 100644 --- a/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala +++ b/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala @@ -182,7 +182,7 @@ class ChangeRequestChangesForm( def groupChild(groupId: NodeGroupId) = new JsTreeNode { val changes = changeRequest.nodeGroups(groupId).changes - val groupeName = changes.initialState + val groupName = changes.initialState .map(_.name) .getOrElse(changes.firstChange.diff match { case a: AddNodeGroupDiff => a.group.name @@ -191,7 +191,7 @@ class ChangeRequestChangesForm( }) val body = SHtml.a( () => SetHtml("history", displayHistory(rootRuleCategory, Nil, List(changes))), - {groupeName} + {groupName} ) val children = Nil diff --git a/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestEditForm.scala b/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestEditForm.scala index 086ff5ce2..539c62e4e 100644 --- a/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestEditForm.scala +++ b/change-validation/src/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestEditForm.scala @@ -93,7 +93,7 @@ class ChangeRequestEditForm( private[this] val formTracker = new FormTracker(changeRequestName) private[this] def onNothingToDo: JsCmd = { formTracker.addFormError(error("There are no modifications to save.")) - updateFomClientSide + updateFromClientSide } private[this] val isEditable = { val authz = CurrentUser.getRights.authorizationTypes.toSeq.collect { case right: ActionType.Edit => right.authzKind } @@ -124,7 +124,7 @@ class ChangeRequestEditForm( if (isEditable) changeRequestDescription.toForm_! else changeRequestDescription.readOnlyValue } - def updateFomClientSide = SetHtml(containerId, display) + def updateFromClientSide = SetHtml(containerId, display) def display: NodeSeq = { ("#detailsForm *" #> { (n: NodeSeq) => SHtml.ajaxForm(n) } andThen @@ -141,7 +141,7 @@ class ChangeRequestEditForm( def submit = { if (formTracker.hasErrors) { formTracker.addFormError(error("There was problem with your request")) - updateFomClientSide + updateFromClientSide } else { val newInfo = ChangeRequestInfo(changeRequestName.get, changeRequestDescription.get) if (info == newInfo) { diff --git a/consul/README.adoc b/consul/README.adoc index 0ff682854..10754f5fa 100644 --- a/consul/README.adoc +++ b/consul/README.adoc @@ -17,7 +17,7 @@ features are: * Provide an ACL system and enable traffic encryption. -* Provide a healthcheck service that return the health state of differents services. +* Provide a healthcheck service that return the health state of different services. * Provides a cluster of server nodes to ensure high availability. @@ -26,7 +26,7 @@ your needs. The Rudder server does not need to access the Consul server to get k == Installation -* You're supposed to already have your Consul environment configured, with differents keys-values that can be: Indexed objects, configuration parameters or metadata. +* You're supposed to already have your Consul environment configured, with different keys-values that can be: Indexed objects, configuration parameters or metadata. * Install the plugin on your Rudder server diff --git a/consul/build.conf b/consul/build.conf index 80bf35dfc..6010620f4 100644 --- a/consul/build.conf +++ b/consul/build.conf @@ -11,7 +11,7 @@ plugin-name=consul # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Plugin for Consul integration with Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Plugin for Consul integration with Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/datasources/build.conf b/datasources/build.conf index b8e5f9059..52920e8d5 100644 --- a/datasources/build.conf +++ b/datasources/build.conf @@ -22,5 +22,5 @@ in the dedicated managemen # - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.3 diff --git a/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala b/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala index 82cb2f6a6..5d1a6f1f4 100644 --- a/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala +++ b/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala @@ -120,7 +120,7 @@ class GetDataset(valueCompiler: InterpolatedValueCompiler) { for { parameters <- ZIO .foreach(parameters)(compiler.compileParameters(_).toIO) - .chainError("Error when transforming Rudder Parameter for variable interpolation") + .chainError("Error when transforming Rudder parameter for variable interpolation") expand = compiler.compileInput(node, policyServer, globalPolicyMode, parameters.toMap) _ url <- expand(datasource.url).chainError(s"Error when trying to parse URL ${datasource.url}") path <- expand(datasource.path).chainError(s"Error when trying to compile JSON path ${datasource.path}") diff --git a/glpi/build.conf b/glpi/build.conf index 5d6d77295..ebdf91d39 100644 --- a/glpi/build.conf +++ b/glpi/build.conf @@ -11,7 +11,7 @@ plugin-name=glpi # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Plugin for GLPI integration with Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Plugin for GLPI integartion with Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/helloworld/build.conf b/helloworld/build.conf index e9ffc8fdb..306f3c44e 100644 --- a/helloworld/build.conf +++ b/helloworld/build.conf @@ -17,5 +17,5 @@ plugin-web-description=

An example plugin for Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/helloworld/src/main/scala/com/normation/plugins/helloworld/service/LogAccessInDb.scala b/helloworld/src/main/scala/com/normation/plugins/helloworld/service/LogAccessInDb.scala index 8f08d1dd7..12b0df099 100644 --- a/helloworld/src/main/scala/com/normation/plugins/helloworld/service/LogAccessInDb.scala +++ b/helloworld/src/main/scala/com/normation/plugins/helloworld/service/LogAccessInDb.scala @@ -24,7 +24,7 @@ class LogAccessInDb(dbUrl: String, dbUser: String, dbPass: String) extends Logga def init(): Unit = { - logger.info("Droping and creting table in database with given schema:") + logger.info("Dropping and creting table in database with given schema:") base = Nil } diff --git a/main-build.conf b/main-build.conf index e4d25e0f3..f9a4a4e64 100644 --- a/main-build.conf +++ b/main-build.conf @@ -9,7 +9,7 @@ # - A.B.C: Rudder major.minor.patch # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. # Only rudder branch is defined here. # Version of Rudder used to build the plugin. # It defined the API/ABI used and it is important for binary compatibility diff --git a/makefiles/common-scala-plugin.mk b/makefiles/common-scala-plugin.mk index 6f6f2fca5..2239d8237 100644 --- a/makefiles/common-scala-plugin.mk +++ b/makefiles/common-scala-plugin.mk @@ -10,7 +10,7 @@ FILES += $(NAME) include ../makefiles/common.mk ## For licensed plugins -# The path are expected on Rudder, and the license and key file will be provided separatly +# The path are expected on Rudder, and the license and key file will be provided separately # standard destination path for the license file is in module directory, "license.sign" TARGET_LICENSE_PATH = /opt/rudder/etc/plugins/licenses/$(NAME).license # standard destination path for the key: diff --git a/node-external-reports/README.adoc b/node-external-reports/README.adoc index d5b084d43..22b6d3ba7 100644 --- a/node-external-reports/README.adoc +++ b/node-external-reports/README.adoc @@ -65,7 +65,7 @@ plugin.node-external-reports.reports { Note that quotes are mandatory only when the value contains `@@` (so most likely only for the `filename` parameter). -- "01_first_report_type" is a unique key, used internaly (in logs for example) and for +- "01_first_report_type" is a unique key, used internally (in logs for example) and for sorting reports display order in node page; - "title" is the name of section in the external document tab; - "dirname" is the base directory on the local file system where documents are stored; diff --git a/node-external-reports/build.conf b/node-external-reports/build.conf index 8b6fe7f72..75756a2d2 100644 --- a/node-external-reports/build.conf +++ b/node-external-reports/build.conf @@ -25,5 +25,5 @@ plugin-web-description="""

This is a plugin that allows to disaply external te # - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/node-external-reports/src/main/resources/node-external-reports.properties b/node-external-reports/src/main/resources/node-external-reports.properties index d2b97d434..8d32f46ed 100644 --- a/node-external-reports/src/main/resources/node-external-reports.properties +++ b/node-external-reports/src/main/resources/node-external-reports.properties @@ -4,7 +4,7 @@ #The name of the tab in node details for report. #Must be non empty -plugin.node-external-reports.tab-name=External Reports +plugin.node-external-reports.tab-name=External reports # diff --git a/node-external-reports/src/main/resources/nodeExternalReports.html b/node-external-reports/src/main/resources/nodeExternalReports.html index 05d16cdc6..2255edca6 100644 --- a/node-external-reports/src/main/resources/nodeExternalReports.html +++ b/node-external-reports/src/main/resources/nodeExternalReports.html @@ -1,13 +1,13 @@ - Rudder - Node External Reports + Rudder - Node external reports

-
External information for Nodes
+
External information for nodes
This plugin allows to add external, static documents in a new tab in node details. diff --git a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/NodeExternalReportPluginDef.scala b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/NodeExternalReportPluginDef.scala index 2aa145686..a8811e41d 100644 --- a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/NodeExternalReportPluginDef.scala +++ b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/NodeExternalReportPluginDef.scala @@ -64,7 +64,7 @@ class NodeExternalReportsPluginDef(api: NodeExternalReportApi, override val stat override def pluginMenuEntry: List[(Menu, Option[String])] = { ( - (Menu("160-nodeExternalReportInfo", Node External Reports) / "secure" / "plugins" / "nodeexternalreports" >> + (Menu("160-nodeExternalReportInfo", Node external reports) / "secure" / "plugins" / "nodeexternalreports" >> LocGroup("pluginsGroup") >> Template(() => { ClasspathTemplates("nodeExternalReports" :: Nil) openOr diff --git a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/extension/CreateNodeDetailsExtension.scala b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/extension/CreateNodeDetailsExtension.scala index ca2c8b793..b32b821dd 100644 --- a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/extension/CreateNodeDetailsExtension.scala +++ b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/extension/CreateNodeDetailsExtension.scala @@ -66,7 +66,7 @@ class CreateNodeDetailsExtension(externalReport: ReadExternalReports, val status val (tabTitle, content) = externalReport.getExternalReports(snippet.nodeId) match { case eb: EmptyBox => val e = eb ?~! "Can not display external reports for that node" - ("External Reports",
{e.messageChain}
) + ("External reports",
{e.messageChain}
) case Full(config) => (config.tabTitle,
{tabContent(config.reports)(myXml)}
) } diff --git a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/service/ReadExternalReports.scala b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/service/ReadExternalReports.scala index a494e9d36..343c36024 100644 --- a/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/service/ReadExternalReports.scala +++ b/node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/service/ReadExternalReports.scala @@ -131,7 +131,7 @@ class ReadExternalReports(nodeInfoService: NodeInfoService, val reportConfigFile conf <- config optNode <- nodeInfoService.getNodeInfo(nodeId).toBox node <- optNode match { - case None => Failure(s"The node with ID '${nodeId}' was not found, we can add external information") + case None => Failure(s"The node with ID '${nodeId}' was not found, we can't add external information") case Some(n) => Full(n) } } yield { diff --git a/notify/build.conf b/notify/build.conf index a3e8d8f6a..da8b6c5d6 100644 --- a/notify/build.conf +++ b/notify/build.conf @@ -11,7 +11,7 @@ plugin-name=notify # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Notifications plugin for Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Notification plugin for Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.2 diff --git a/openscap/README.adoc b/openscap/README.adoc index 57ed0710d..57b38198c 100644 --- a/openscap/README.adoc +++ b/openscap/README.adoc @@ -30,7 +30,7 @@ The technique comes with two parameters: image:openscap/openscap-directive.png[OpenSCAP directive example] -SCAP content refers to document in the XCCDF, OVAL and Source DataStream formats. These documents can be presented in different forms and by different organizations to meet their security automation and technical implementation needs. You can find more informations on the https://github.com/ComplianceAsCode/content[ComplianceAsCode] GitHub project. +SCAP content refers to document in the XCCDF, OVAL and Source DataStream formats. These documents can be presented in different forms and by different organizations to meet their security automation and technical implementation needs. You can find more information on the https://github.com/ComplianceAsCode/content[ComplianceAsCode] GitHub project. By default, available `scap_files` are located on `/usr/share/xml/scap/ssg/content/` after installation of the openSCAP agent on the nodes. Given profiles for specific scap_files can be obtain with the command: diff --git a/openscap/build.conf b/openscap/build.conf index e1b888cf1..709ca1d0c 100644 --- a/openscap/build.conf +++ b/openscap/build.conf @@ -11,7 +11,7 @@ plugin-name=openscap # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""OpenSCAP audits managed by Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

OpenSCAP audits managed by Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/openscap/packaging/prerm b/openscap/packaging/prerm index b921ba6e2..157007584 100755 --- a/openscap/packaging/prerm +++ b/openscap/packaging/prerm @@ -11,7 +11,7 @@ NAME=OpenSCAP_Policies_plugin cd /var/rudder/configuration-repository git reset $PLUGIN_FOLDER/remove_configuration categories $PLUGIN_FOLDER $PLUGIN_FOLDER/openscap.json -git commit -m "Removing $NAME plugin catgories" +git commit -m "Removing $NAME plugin categories" # We need to restore archive when deleting a category, otherwise the active tree is not synchronized correctly curl -k -X POST -H "X-API-Token: $(cat /var/rudder/run/api-token)" https://localhost/rudder/api/latest/system/archives/directives/restore/latestCommit rudder server reload-techniques diff --git a/openscap/src/main/scala/bootstrap/rudder/plugin/OpenscapPoliciesConf.scala b/openscap/src/main/scala/bootstrap/rudder/plugin/OpenscapPoliciesConf.scala index 4ac85d797..12cd686da 100644 --- a/openscap/src/main/scala/bootstrap/rudder/plugin/OpenscapPoliciesConf.scala +++ b/openscap/src/main/scala/bootstrap/rudder/plugin/OpenscapPoliciesConf.scala @@ -113,7 +113,7 @@ object OpenscapPoliciesConf extends RudderPluginModule { ) lazy val openScapApiImpl = new OpenScapApiImpl(RudderConfig.restExtractorService, openScapReportReader, reportSanitizer) - // other service instanciation / initialization + // other service instantiation / initialization RudderConfig.snippetExtensionRegister.register( new OpenScapNodeDetailsExtension(pluginStatusService, openScapReportReader, reportSanitizer) ) diff --git a/openscap/src/main/scala/com/normation/plugins/openscappolicies/api/OpenScapApi.scala b/openscap/src/main/scala/com/normation/plugins/openscappolicies/api/OpenScapApi.scala index 5ca60253e..25819083a 100644 --- a/openscap/src/main/scala/com/normation/plugins/openscappolicies/api/OpenScapApi.scala +++ b/openscap/src/main/scala/com/normation/plugins/openscappolicies/api/OpenScapApi.scala @@ -32,7 +32,7 @@ object OpenScapApi extends ApiModuleProvider[OpenScapApi] { final case object GetOpenScapReport extends OpenScapApi with OneParam with StartsAtVersion12 { val z = implicitly[Line].value - val description = "Get OpenScap report for a node" + val description = "Get OpenSCAP report for a node" val (action, path) = GET / "openscap" / "report" / "{id}" override def dataContainer: Option[String] = Some("openscap") @@ -40,7 +40,7 @@ object OpenScapApi extends ApiModuleProvider[OpenScapApi] { final case object GetSanitizedOpenScapReport extends OpenScapApi with OneParam with StartsAtVersion12 { val z = implicitly[Line].value - val description = "Get sanitized OpenScap report for a node" + val description = "Get sanitized OpenSCAP report for a node" val (action, path) = GET / "openscap" / "sanitized" / "{id}" override def dataContainer: Option[String] = Some("openscap") @@ -135,7 +135,7 @@ class OpenScapApiImpl( authzToken: AuthzToken ): LiftResponse = { (for { - report <- openScapReportReader.getOpenScapReport(NodeId(nodeId)) ?~! s"Cannot get OpenScap Report for node ${nodeId}" + report <- openScapReportReader.getOpenScapReport(NodeId(nodeId)) ?~! s"Cannot get OpenSCAP report for node ${nodeId}" existence <- Box(report) ?~! s"Report not found for node ${nodeId}" sanitizedXml <- reportSanitizer.sanitizeReport(existence).toBox ?~! "Error while sanitizing report" } yield { @@ -151,7 +151,7 @@ class OpenScapApiImpl( 200 ) case eb: EmptyBox => - val errorMessage = eb ?~! "Could not get the sanitized OpenScap report for node ${nodeId}" + val errorMessage = eb ?~! "Could not get the sanitized OpenSCAP report for node ${nodeId}" logger.error(errorMessage.messageChain) val html =
{errorMessage.messageChain}
InMemoryResponse( diff --git a/openscap/src/main/scala/com/normation/plugins/openscappolicies/extension/OpenScapNodeDetailsExtension.scala b/openscap/src/main/scala/com/normation/plugins/openscappolicies/extension/OpenScapNodeDetailsExtension.scala index a8814187b..27c8f2186 100644 --- a/openscap/src/main/scala/com/normation/plugins/openscappolicies/extension/OpenScapNodeDetailsExtension.scala +++ b/openscap/src/main/scala/com/normation/plugins/openscappolicies/extension/OpenScapNodeDetailsExtension.scala @@ -36,7 +36,7 @@ class OpenScapNodeDetailsExtension( val nodeId = snippet.nodeId val content = openScapReader.checkOpenScapReportExistence(nodeId) match { case eb: EmptyBox => - val e = eb ?~! "Can not display OpenScap report for that node" + val e = eb ?~! "Can not display OpenSCAP report for that node" (
{e.messageChain}
) @@ -51,7 +51,7 @@ class OpenScapNodeDetailsExtension(

That tab gives access to OpenSCAP report configured for that node.


-
There are no OpenScap report available yet for node +
There are no OpenSCAP report available yet for node {snippet.nodeId.value}
diff --git a/openscap/src/main/scala/com/normation/plugins/openscappolicies/services/OpenScapReportReader.scala b/openscap/src/main/scala/com/normation/plugins/openscappolicies/services/OpenScapReportReader.scala index ecd6b7565..e792cfbc7 100644 --- a/openscap/src/main/scala/com/normation/plugins/openscappolicies/services/OpenScapReportReader.scala +++ b/openscap/src/main/scala/com/normation/plugins/openscappolicies/services/OpenScapReportReader.scala @@ -54,7 +54,7 @@ class OpenScapReportReader( logger.error(errMessage) Failure(errMessage) case Full(directives) if directives.size == 0 => - logger.info("There are not OpensCAP based directive yet") + logger.info("There are no OpensCAP-based directive yet") Full(false) case Full(directives) => val expectedOption = (for { @@ -85,7 +85,7 @@ class OpenScapReportReader( def checkOpenScapReportExistence(nodeId: NodeId): Box[Boolean] = { nodeInfoService.getNodeInfo(nodeId).toBox match { case t: EmptyBox => - val errMessage = s"Node with id ${nodeId.value} does not exists" + val errMessage = s"Node with id ${nodeId.value} does not exist" logger.error(errMessage) Failure(errMessage) case Full(id) => diff --git a/plugins-common-private/build.conf b/plugins-common-private/build.conf index 5543d8697..90da22dfc 100644 --- a/plugins-common-private/build.conf +++ b/plugins-common-private/build.conf @@ -16,6 +16,6 @@ plugin-name=plugins-common-private # - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.0 diff --git a/plugins-common/pom-template.xml b/plugins-common/pom-template.xml index 91d6602bc..4818476e7 100644 --- a/plugins-common/pom-template.xml +++ b/plugins-common/pom-template.xml @@ -360,7 +360,7 @@ com.normation.rudder rudder-web ${rudder-build-version} - + classes provided diff --git a/qa-test b/qa-test index 2eb6d00cb..d371d9295 100755 --- a/qa-test +++ b/qa-test @@ -41,7 +41,7 @@ test_python_error() test_typos() { # json file below has a name which looks like a typo in its first part, skipping it - typos --exclude '*.css' --exclude '*-6a9f-4865-a837-95a6a0c49f04.json' + typos --exclude 'RestDataSourceTest.scala' --exclude 'ipaddress.py' --exclude '*.css' --exclude '*-6a9f-4865-a837-95a6a0c49f04.json' } test_scripts() diff --git a/scale-out-relay/build.conf b/scale-out-relay/build.conf index 8b582ba92..192dbc5cd 100644 --- a/scale-out-relay/build.conf +++ b/scale-out-relay/build.conf @@ -11,7 +11,7 @@ plugin-name=scale-out-relay # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Enable usage of scale-out relay servers""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Enable usage of scale-out relay servers

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/ScaleOutRelayService.scala b/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/ScaleOutRelayService.scala index 70c423758..0072646be 100644 --- a/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/ScaleOutRelayService.scala +++ b/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/ScaleOutRelayService.scala @@ -145,32 +145,32 @@ class ScaleOutRelayService( val nPromoted = woLDAPNodeRepository.deleteNode(newInfo.node, modId, actor, reason).unit val nBeforePromoted = woLDAPNodeRepository .createNode(old.node, modId, actor, reason) - .chainError(s"Demote relay failed : restore '${newInfo.node}' configuration failed") + .chainError(s"Demote relay failed: restore '${newInfo.node}' configuration failed") .unit val targets = objects.targets.map(t => { woLDAPNodeGroupRepository .deletePolicyServerTarget(t) - .chainError(s"Demote relay failed : removing '${newInfo.node}' configuration failed") + .chainError(s"Demote relay failed: removing '${newInfo.node}' configuration failed") .unit }) val groups = objects.groups.map(g => { woLDAPNodeGroupRepository .delete(g.id, modId, actor, reason) - .chainError(s"Demote relay failed : removing node group '${g.id.serialize}' failed") + .chainError(s"Demote relay failed: removing node group '${g.id.serialize}' failed") .unit }) val directives = objects.directives.toList.map(d => { woDirectiveRepository .deleteSystemDirective(d._2.id.uid, modId, actor, reason) - .chainError(s"Demote relay failed : removing directive '${d._2.id.debugString}' failed") + .chainError(s"Demote relay failed: removing directive '${d._2.id.debugString}' failed") .unit }) val rules = objects.rules.map(r => { woRuleRepository .deleteSystemRule(r.id, modId, actor, reason) .catchAll { err => - ScaleOutRelayLoggerPure.info(s"Trying to remove residual object Rule ${r.id.serialize} : ${err.fullMsg}") + ScaleOutRelayLoggerPure.info(s"Trying to remove residual object rule ${r.id.serialize}: ${err.fullMsg}") } .unit }) diff --git a/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/api/ScaleOutRelayApi.scala b/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/api/ScaleOutRelayApi.scala index c6ad2848b..5d420abd4 100644 --- a/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/api/ScaleOutRelayApi.scala +++ b/scale-out-relay/src/main/scala/com/normation/plugins/scaleoutrelay/api/ScaleOutRelayApi.scala @@ -108,7 +108,7 @@ class ScaleOutRelayApiImpl( case Full(node) => toJsonResponse(None, nodeId)("demoteToNode", true) case eb: EmptyBox => - val message = (eb ?~ (s"Error when trying to promote mode $nodeId")).msg + val message = (eb ?~ (s"Error when trying to demote mode $nodeId")).msg toJsonError(None, message)("demoteToNode", true) } } diff --git a/src/main/g8/build.conf b/src/main/g8/build.conf index a4363578c..e7d70f246 100644 --- a/src/main/g8/build.conf +++ b/src/main/g8/build.conf @@ -11,7 +11,7 @@ plugin-name=$plugin_name$ # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-\${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""$title_description$""" # WEB, HTML description. @@ -21,6 +21,6 @@ plugin-web-description=$web_description$ # - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=$version$ diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 725563f15..90ba699b3 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,7 +1,7 @@ # the name of the plugin will be used to derive: # - the plugin id by using lower cases and "-": my-plugin # - the package name by concatening everything: myplugin -# - main clases with camel case: MyPluginDef, MyPluginConf... +# - main classes with camel case: MyPluginDef, MyPluginConf... name = My Plugin version = 1.0 diff --git a/src/main/g8/src/main/scala/bootstrap/rudder/plugin/$plugin_class$Conf.scala b/src/main/g8/src/main/scala/bootstrap/rudder/plugin/$plugin_class$Conf.scala index 63bfb67aa..a6cd0dcb6 100644 --- a/src/main/g8/src/main/scala/bootstrap/rudder/plugin/$plugin_class$Conf.scala +++ b/src/main/g8/src/main/scala/bootstrap/rudder/plugin/$plugin_class$Conf.scala @@ -53,7 +53,7 @@ object $plugin_class$Conf extends RudderPluginModule { lazy val pluginDef = new $plugin_class$PluginDef($plugin_class$Conf.pluginStatusService) - // other service instanciation / initialization + // other service instantiation / initialization } diff --git a/user-management/build.conf b/user-management/build.conf index b645e0102..8ec9874d1 100644 --- a/user-management/build.conf +++ b/user-management/build.conf @@ -11,7 +11,7 @@ plugin-name=user-management # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Manage rudder users and their authorizations""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Manage rudder users and their authorizations

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.2 diff --git a/user-management/src/main/elm/sources/UserManagement.elm b/user-management/src/main/elm/sources/UserManagement.elm index 7eca3faa5..0796d3c2c 100644 --- a/user-management/src/main/elm/sources/UserManagement.elm +++ b/user-management/src/main/elm/sources/UserManagement.elm @@ -72,7 +72,7 @@ update msg model = SendReload -> (model, postReloadConf model) - |> createSuccessNotification "User configuration's file have been reloaded" + |> createSuccessNotification "User configuration file have been reloaded" ToastyMsg subMsg -> Toasty.update defaultConfig ToastyMsg subMsg model diff --git a/user-management/src/main/elm/sources/View.elm b/user-management/src/main/elm/sources/View.elm index b3628c25a..5011bd63e 100644 --- a/user-management/src/main/elm/sources/View.elm +++ b/user-management/src/main/elm/sources/View.elm @@ -54,7 +54,7 @@ showDeleteModal username = [ div [class "row"] [ - h4 [class "col-lg-12 col-sm-12 col-xs-12 text-center"][text "Are you sure you want to delete user " , b[][text username] , text " ?"] + h4 [class "col-lg-12 col-sm-12 col-xs-12 text-center"][text "Are you sure you want to delete user " , b[][text username] , text "?"] ] ] , div [class "modal-footer"] @@ -209,7 +209,7 @@ displayRightPanel model = h2 [class "title-username"] [text user.login] , button [class "btn btn-sm btn-outline-secondary", onClick DeactivatePanel][text "Close"] ] - , input [class "form-control username-input", type_ "text", placeholder "New Username", onInput Login] [] + , input [class "form-control username-input", type_ "text", placeholder "New username", onInput Login] [] , displayPasswordBlock model , h4 [class "role-title"][text "Roles"] , div [class "role-management-wrapper"] @@ -262,7 +262,7 @@ displayUsersConf model u = [ div [] [ - h2 [][text "User Management Configuration"] + h2 [][text "User management"] , div [class"description-plugin"] [ p [] [text "This page shows you the current Rudder users and their rights."] diff --git a/user-management/src/main/scala/bootstrap/rudder/plugin/UserManagementConf.scala b/user-management/src/main/scala/bootstrap/rudder/plugin/UserManagementConf.scala index d022d650c..6f17b078b 100644 --- a/user-management/src/main/scala/bootstrap/rudder/plugin/UserManagementConf.scala +++ b/user-management/src/main/scala/bootstrap/rudder/plugin/UserManagementConf.scala @@ -50,7 +50,7 @@ import com.normation.plugins.usermanagement.api.UserManagementApiImpl */ class UserManagementAuthorizationLevel(status: PluginStatus) extends UserAuthorisationLevel { override def userAuthEnabled: Boolean = status.isEnabled() - override val name: String = "User Management pluging: extended authorizations" + override val name: String = "User Management plugin: extended authorizations" } /* diff --git a/vault/build.conf b/vault/build.conf index fe4e618a4..f02e844fe 100644 --- a/vault/build.conf +++ b/vault/build.conf @@ -11,7 +11,7 @@ plugin-name=vault # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Plugin for Vault integration with Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Plugin for Vault integartion with Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1 diff --git a/zabbix/README.adoc b/zabbix/README.adoc index 5b0ff7c63..b77e09013 100644 --- a/zabbix/README.adoc +++ b/zabbix/README.adoc @@ -72,7 +72,7 @@ on the Rudder server. In order to configure the monitoring to the Rudder nodes, you can provide Zabbix with templates and parameters (macros) associated to Zabbix hosts and will be synchronized with zabbix using its API. -This operation can be mannually executed by running: +This operation can be manually executed by running: ---- /opt/rudder/bin/zabbix-plugin.py apply-configuration diff --git a/zabbix/build.conf b/zabbix/build.conf index e1844c7c7..ee25ef077 100644 --- a/zabbix/build.conf +++ b/zabbix/build.conf @@ -11,7 +11,7 @@ plugin-name=zabbix # the full name is derived from rudder-plugin-name plugin-fullname=rudder-plugin-${plugin-name} -# Human readable short/title descrption (used for one line text) +# Human readable short/title description (used for one line text) plugin-title-description="""Plugin for ZABBIX integration with Rudder""" # WEB, HTML description. @@ -21,5 +21,5 @@ plugin-web-description=

Plugin for ZABBIX integartion with Rudder

# - A.B: Rudder major.minor # - x.y(.z): plugin major.minor.micro. Micro should be omitted. When omitted, z is assumed to be 0. # For the build, we split the information between two properties, rudder branch and plugin version, -# which must be concaneted with "-" to build the plugin version. +# which must be concatenated with "-" to build the plugin version. plugin-version=2.1