From 010a2c5b25cf015d9c05976f4cef92ee47e9bab7 Mon Sep 17 00:00:00 2001 From: Wesley Whetstone Date: Mon, 10 Jun 2019 16:25:46 -0700 Subject: [PATCH 1/5] Update documentation for newer mac_service module. --- doc/ref/modules/all/salt.modules.service.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ref/modules/all/salt.modules.service.rst b/doc/ref/modules/all/salt.modules.service.rst index 6ff3e46c2a..7ad6c29ef8 100644 --- a/doc/ref/modules/all/salt.modules.service.rst +++ b/doc/ref/modules/all/salt.modules.service.rst @@ -17,7 +17,7 @@ Execution Module Used for :py:mod:`~salt.modules.freebsdservice` FreeBSD-based OSes using ``service(8)`` :py:mod:`~salt.modules.gentoo_service` Gentoo Linux using ``sysvinit`` and ``rc-update(8)`` -:py:mod:`~salt.modules.launchctl` Mac OS hosts using ``launchctl(1)`` +:py:mod:`~salt.modules.mac_service` macOS hosts using ``launchctl(1)`` :py:mod:`~salt.modules.netbsdservice` NetBSD-based OSes :py:mod:`~salt.modules.openbsdservice` OpenBSD-based OSes :py:mod:`~salt.modules.rh_service` RedHat-based distros and derivatives From 56f65ec2db672a0e0e9bfb3093787150306943b3 Mon Sep 17 00:00:00 2001 From: Adam Mendlik Date: Sat, 15 Jun 2019 08:32:41 -0600 Subject: [PATCH 2/5] Fix broken documentation links for pkg virtual module --- doc/ref/modules/all/salt.modules.pkg.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/ref/modules/all/salt.modules.pkg.rst b/doc/ref/modules/all/salt.modules.pkg.rst index 04012b6d02..8380425f51 100644 --- a/doc/ref/modules/all/salt.modules.pkg.rst +++ b/doc/ref/modules/all/salt.modules.pkg.rst @@ -14,26 +14,26 @@ Execution Module Used for ====================================== ======================================== :py:mod:`~salt.modules.aptpkg` Debian/Ubuntu-based distros which use ``apt-get(8)`` for package management -:py:mod:`~salt.modules.brew` Mac OS software management using +:py:mod:`~salt.modules.mac_brew_pkg` Mac OS software management using `Homebrew`_ -:py:mod:`~salt.modules.ebuild` Gentoo-based systems (utilizes the +:py:mod:`~salt.modules.ebuildpkg` Gentoo-based systems (utilizes the ``portage`` python module as well as ``emerge(1)``) :py:mod:`~salt.modules.freebsdpkg` FreeBSD-based OSes using ``pkg_add(1)`` :py:mod:`~salt.modules.openbsdpkg` OpenBSD-based OSes using ``pkg_add(1)`` -:py:mod:`~salt.modules.pacman` Arch Linux-based distros using +:py:mod:`~salt.modules.pacmanpkg` Arch Linux-based distros using ``pacman(8)`` :py:mod:`~salt.modules.pkgin` NetBSD-based OSes using ``pkgin(1)`` :py:mod:`~salt.modules.pkgng` FreeBSD-based OSes using ``pkg(8)`` :py:mod:`~salt.modules.pkgutil` Solaris-based OSes using `OpenCSW`_'s ``pkgutil(1)`` :py:mod:`~salt.modules.solarispkg` Solaris-based OSes using ``pkgadd(1M)`` -:py:mod:`~salt.modules.solarisips` Solaris-based OSes using IPS ``pkg(1)`` +:py:mod:`~salt.modules.solarisipspkg` Solaris-based OSes using IPS ``pkg(1)`` :py:mod:`~salt.modules.win_pkg` Salt's :ref:`Windows Package Manager ` :py:mod:`~salt.modules.yumpkg` RedHat-based distros and derivatives using ``yum(8)`` or ``dnf(8)`` -:py:mod:`~salt.modules.zypper` SUSE-based distros using ``zypper(8)`` +:py:mod:`~salt.modules.zypperpkg` SUSE-based distros using ``zypper(8)`` ====================================== ======================================== .. _Homebrew: http://brew.sh/ From e360a7067337f29ab37bfb255f8520f3068a5b51 Mon Sep 17 00:00:00 2001 From: Adam Mendlik Date: Sat, 15 Jun 2019 08:33:13 -0600 Subject: [PATCH 3/5] Fix broken documentation links for service virtual module --- doc/ref/modules/all/salt.modules.service.rst | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/ref/modules/all/salt.modules.service.rst b/doc/ref/modules/all/salt.modules.service.rst index 6ff3e46c2a..5617c8d627 100644 --- a/doc/ref/modules/all/salt.modules.service.rst +++ b/doc/ref/modules/all/salt.modules.service.rst @@ -10,26 +10,26 @@ salt.modules.service ``service`` is a virtual module that is fulfilled by one of the following modules: -====================================== ======================================== -Execution Module Used for -====================================== ======================================== -:py:mod:`~salt.modules.debian_service` Debian Wheezy and earlier -:py:mod:`~salt.modules.freebsdservice` FreeBSD-based OSes using ``service(8)`` -:py:mod:`~salt.modules.gentoo_service` Gentoo Linux using ``sysvinit`` and - ``rc-update(8)`` -:py:mod:`~salt.modules.launchctl` Mac OS hosts using ``launchctl(1)`` -:py:mod:`~salt.modules.netbsdservice` NetBSD-based OSes -:py:mod:`~salt.modules.openbsdservice` OpenBSD-based OSes -:py:mod:`~salt.modules.rh_service` RedHat-based distros and derivatives - using ``service(8)`` and - ``chkconfig(8)``. Supports both pure - sysvinit and mixed sysvinit/upstart - systems. -:py:mod:`~salt.modules.service` Fallback which simply wraps sysvinit - scripts -:py:mod:`~salt.modules.smf` Solaris-based OSes which use SMF -:py:mod:`~salt.modules.systemd` Linux distros which use systemd -:py:mod:`~salt.modules.upstart` Ubuntu-based distros using upstart -:py:mod:`~salt.modules.win_service` Windows -====================================== ======================================== +========================================= ======================================== +Execution Module Used for +========================================= ======================================== +:py:mod:`~salt.modules.debian_service` Debian Wheezy and earlier +:py:mod:`~salt.modules.freebsdservice` FreeBSD-based OSes using ``service(8)`` +:py:mod:`~salt.modules.gentoo_service` Gentoo Linux using ``sysvinit`` and + ``rc-update(8)`` +:py:mod:`~salt.modules.launchctl_service` Mac OS hosts using ``launchctl(1)`` +:py:mod:`~salt.modules.netbsdservice` NetBSD-based OSes +:py:mod:`~salt.modules.openbsdservice` OpenBSD-based OSes +:py:mod:`~salt.modules.rh_service` RedHat-based distros and derivatives + using ``service(8)`` and + ``chkconfig(8)``. Supports both pure + sysvinit and mixed sysvinit/upstart + systems. +:py:mod:`~salt.modules.service` Fallback which simply wraps sysvinit + scripts +:py:mod:`~salt.modules.smf_service` Solaris-based OSes which use SMF +:py:mod:`~salt.modules.systemd_service` Linux distros which use systemd +:py:mod:`~salt.modules.upstart_service` Ubuntu-based distros using upstart +:py:mod:`~salt.modules.win_service` Windows +========================================= ======================================== From b9c1b1a35ea8369f0155aeb0f1e1b9e380d39637 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 18 Jun 2019 17:07:02 -0700 Subject: [PATCH 4/5] Update salt.modules.service.rst Fixing merge conflict. --- doc/ref/modules/all/salt.modules.service.rst | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/ref/modules/all/salt.modules.service.rst b/doc/ref/modules/all/salt.modules.service.rst index 4362d7f081..06449f4ee2 100644 --- a/doc/ref/modules/all/salt.modules.service.rst +++ b/doc/ref/modules/all/salt.modules.service.rst @@ -10,25 +10,25 @@ salt.modules.service ``service`` is a virtual module that is fulfilled by one of the following modules: -====================================== ======================================== -Execution Module Used for -====================================== ======================================== -:py:mod:`~salt.modules.debian_service` Debian Wheezy and earlier -:py:mod:`~salt.modules.freebsdservice` FreeBSD-based OSes using ``service(8)`` -:py:mod:`~salt.modules.gentoo_service` Gentoo Linux using ``sysvinit`` and - ``rc-update(8)`` -:py:mod:`~salt.modules.mac_service` macOS hosts using ``launchctl(1)`` -:py:mod:`~salt.modules.netbsdservice` NetBSD-based OSes -:py:mod:`~salt.modules.openbsdservice` OpenBSD-based OSes -:py:mod:`~salt.modules.rh_service` RedHat-based distros and derivatives - using ``service(8)`` and - ``chkconfig(8)``. Supports both pure - sysvinit and mixed sysvinit/upstart - systems. -:py:mod:`~salt.modules.service` Fallback which simply wraps sysvinit - scripts -:py:mod:`~salt.modules.smf_service` Solaris-based OSes which use SMF -:py:mod:`~salt.modules.systemd_service` Linux distros which use systemd -:py:mod:`~salt.modules.upstart_service` Ubuntu-based distros using upstart -:py:mod:`~salt.modules.win_service` Windows -====================================== ======================================== +========================================= ======================================== +Execution Module Used for +========================================= ======================================== +:py:mod:`~salt.modules.debian_service` Debian Wheezy and earlier +:py:mod:`~salt.modules.freebsdservice` FreeBSD-based OSes using ``service(8)`` +:py:mod:`~salt.modules.gentoo_service` Gentoo Linux using ``sysvinit`` and + ``rc-update(8)`` +:py:mod:`~salt.modules.mac_service` Mac OS hosts using ``launchctl(1)`` +:py:mod:`~salt.modules.netbsdservice` NetBSD-based OSes +:py:mod:`~salt.modules.openbsdservice` OpenBSD-based OSes +:py:mod:`~salt.modules.rh_service` RedHat-based distros and derivatives + using ``service(8)`` and + ``chkconfig(8)``. Supports both pure + sysvinit and mixed sysvinit/upstart + systems. +:py:mod:`~salt.modules.service` Fallback which simply wraps sysvinit + scripts +:py:mod:`~salt.modules.smf_service` Solaris-based OSes which use SMF +:py:mod:`~salt.modules.systemd_service` Linux distros which use systemd +:py:mod:`~salt.modules.upstart_service` Ubuntu-based distros using upstart +:py:mod:`~salt.modules.win_service` Windows +========================================= ======================================== From 89398a90495ac24263812b623607ae9bdc198713 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 18 Jun 2019 17:10:42 -0700 Subject: [PATCH 5/5] Update salt.modules.service.rst --- doc/ref/modules/all/salt.modules.service.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ref/modules/all/salt.modules.service.rst b/doc/ref/modules/all/salt.modules.service.rst index 06449f4ee2..bd2e474a21 100644 --- a/doc/ref/modules/all/salt.modules.service.rst +++ b/doc/ref/modules/all/salt.modules.service.rst @@ -32,3 +32,4 @@ Execution Module Used for :py:mod:`~salt.modules.upstart_service` Ubuntu-based distros using upstart :py:mod:`~salt.modules.win_service` Windows ========================================= ======================================== +