diff --git a/cdist/conf/type/__zypper_service/explorer/service_id b/cdist/conf/type/__zypper_service/explorer/service_id index 9c3d3a2d..bf5f0260 100644 --- a/cdist/conf/type/__zypper_service/explorer/service_id +++ b/cdist/conf/type/__zypper_service/explorer/service_id @@ -20,8 +20,8 @@ # # Manage services with Zypper (mostly suse) # -if [ -f "$__object/parameter/service_uri" ]; then - uri="$(cat "$__object/parameter/service_uri")" +if [ -f "$__object/parameter/uri" ]; then + uri="$(cat "$__object/parameter/uri")" else uri="/$__object_id" fi diff --git a/cdist/conf/type/__zypper_service/explorer/service_uri b/cdist/conf/type/__zypper_service/explorer/service_uri index 2f4f8960..bcad4ec8 100644 --- a/cdist/conf/type/__zypper_service/explorer/service_uri +++ b/cdist/conf/type/__zypper_service/explorer/service_uri @@ -20,8 +20,8 @@ # # Manage services with Zypper (mostly suse) # -if [ -f "$__object/parameter/service_uri" ]; then - uri="$(cat "$__object/parameter/service_uri")" +if [ -f "$__object/parameter/uri" ]; then + uri="$(cat "$__object/parameter/uri")" else uri="/$__object_id" fi diff --git a/cdist/conf/type/__zypper_service/gencode-remote b/cdist/conf/type/__zypper_service/gencode-remote index df8d1660..ebd5fc5c 100644 --- a/cdist/conf/type/__zypper_service/gencode-remote +++ b/cdist/conf/type/__zypper_service/gencode-remote @@ -33,8 +33,8 @@ else desc="$__object_id" fi -if [ -f "$__object/parameter/service_uri" ]; then - uri="$(cat "$__object/parameter/service_uri")" +if [ -f "$__object/parameter/uri" ]; then + uri="$(cat "$__object/parameter/uri")" else uri="$__object_id" fi diff --git a/cdist/conf/type/__zypper_service/man.text b/cdist/conf/type/__zypper_service/man.text index 31543d93..b6bba660 100644 --- a/cdist/conf/type/__zypper_service/man.text +++ b/cdist/conf/type/__zypper_service/man.text @@ -15,7 +15,7 @@ zypper is usually used on SuSE systems to manage services. REQUIRED PARAMETERS ------------------- -service_uri:: +uri:: Uri of the service @@ -45,13 +45,13 @@ EXAMPLES -------------------------------------------------------------------------------- # Ensure that internal SLES11 SP3 RIS is in installed and all other services and repos are discarded -__zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --service_uri "http://path/to/your/ris/dir" --remove-all-other-services --remove-all-repos +__zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --uri "http://path/to/your/ris/dir" --remove-all-other-services --remove-all-repos # Ensure that internal SLES11 SP3 RIS is in installed, no changes to ohter services or repos -__zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --service_uri "http://path/to/your/ris/dir" +__zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --uri "http://path/to/your/ris/dir" # Drop service by uri, no changes to ohter services or repos -__zypper_service INTERNAL_SLES11_SP3 --state absent --service_uri "http://path/to/your/ris/dir" +__zypper_service INTERNAL_SLES11_SP3 --state absent --uri "http://path/to/your/ris/dir" -------------------------------------------------------------------------------- diff --git a/cdist/conf/type/__zypper_service/manifest b/cdist/conf/type/__zypper_service/manifest index aa4a39a3..b21f3f98 100644 --- a/cdist/conf/type/__zypper_service/manifest +++ b/cdist/conf/type/__zypper_service/manifest @@ -27,8 +27,8 @@ zypper_def_opts=" -q " -if [ -f "$__object/parameter/service_uri" ]; then - uri="$(cat "$__object/parameter/service_uri")" +if [ -f "$__object/parameter/uri" ]; then + uri="$(cat "$__object/parameter/uri")" else uri="$__object_id" fi diff --git a/cdist/conf/type/__zypper_service/parameter/required b/cdist/conf/type/__zypper_service/parameter/required index 2b4645ee..c7954952 100644 --- a/cdist/conf/type/__zypper_service/parameter/required +++ b/cdist/conf/type/__zypper_service/parameter/required @@ -1 +1 @@ -service_uri +uri