diff --git a/cdist/conf/type/__pacman_integrate/files/mirrorlist b/cdist/conf/type/__pacman_conf_integrate/files/mirrorlist similarity index 100% rename from cdist/conf/type/__pacman_integrate/files/mirrorlist rename to cdist/conf/type/__pacman_conf_integrate/files/mirrorlist diff --git a/cdist/conf/type/__pacman_integrate/files/options b/cdist/conf/type/__pacman_conf_integrate/files/options similarity index 100% rename from cdist/conf/type/__pacman_integrate/files/options rename to cdist/conf/type/__pacman_conf_integrate/files/options diff --git a/cdist/conf/type/__pacman_integrate/files/pacman.conf.cdist b/cdist/conf/type/__pacman_conf_integrate/files/pacman.conf.cdist similarity index 100% rename from cdist/conf/type/__pacman_integrate/files/pacman.conf.cdist rename to cdist/conf/type/__pacman_conf_integrate/files/pacman.conf.cdist diff --git a/cdist/conf/type/__pacman_integrate/files/pacman.conf.pacman b/cdist/conf/type/__pacman_conf_integrate/files/pacman.conf.pacman similarity index 100% rename from cdist/conf/type/__pacman_integrate/files/pacman.conf.pacman rename to cdist/conf/type/__pacman_conf_integrate/files/pacman.conf.pacman diff --git a/cdist/conf/type/__pacman_integrate/man.text b/cdist/conf/type/__pacman_conf_integrate/man.text similarity index 75% rename from cdist/conf/type/__pacman_integrate/man.text rename to cdist/conf/type/__pacman_conf_integrate/man.text index f65e30ce..8eb01d5f 100644 --- a/cdist/conf/type/__pacman_integrate/man.text +++ b/cdist/conf/type/__pacman_conf_integrate/man.text @@ -1,11 +1,11 @@ -cdist-type__pacman_integrate(7) -=============================== +cdist-type__pacman_conf_integrate(7) +==================================== Dominique Roux <dominique.roux4@gmail.com> NAME ---- -cdist-type__pacman_integrate - Integrate default pacman.conf to cdist conform and vice versa +cdist-type__pacman_conf_integrate - Integrate default pacman.conf to cdist conform and vice versa DESCRIPTION @@ -28,10 +28,10 @@ EXAMPLES -------------------------------------------------------------------------------- # Convert normal to cdist conform -__pacman_integrate convert +__pacman_conf_integrate convert # Convert cdist conform to normal -__pacman_integrate convert --state absent +__pacman_conf_integrate convert --state absent -------------------------------------------------------------------------------- diff --git a/cdist/conf/type/__pacman_integrate/manifest b/cdist/conf/type/__pacman_conf_integrate/manifest similarity index 100% rename from cdist/conf/type/__pacman_integrate/manifest rename to cdist/conf/type/__pacman_conf_integrate/manifest diff --git a/cdist/conf/type/__pacman_integrate/parameter/default/state b/cdist/conf/type/__pacman_conf_integrate/parameter/default/state similarity index 100% rename from cdist/conf/type/__pacman_integrate/parameter/default/state rename to cdist/conf/type/__pacman_conf_integrate/parameter/default/state diff --git a/cdist/conf/type/__pacman_integrate/parameter/optional b/cdist/conf/type/__pacman_conf_integrate/parameter/optional similarity index 100% rename from cdist/conf/type/__pacman_integrate/parameter/optional rename to cdist/conf/type/__pacman_conf_integrate/parameter/optional diff --git a/docs/changelog b/docs/changelog index 5487d580..034b5342 100644 --- a/docs/changelog +++ b/docs/changelog @@ -3,6 +3,9 @@ Changelog next: * Documentation: Fix spelling in manual pages (Dmitry Bogatov) + * New type: __pacman_conf: Manage pacman.conf (Dominique Roux) + * New type: __pacman_conf_integrate: cdist compatible pacman.conf (Dominique Roux) + 3.1.13: 2015-05-16 * Type __block: Fix support for non stdin blocks (Dominique Roux)