valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove enable/disable funcs from apache_* states

Browse Source 
The apache_*.enable and apache_*.disable state functions are
deprecated in favor of apache_*.enabled and apache_*.disabled.
This commit is contained in:
rallytime 2016-12-19 15:42:39 -07:00
parent a87fa91c7b
commit 810ed4a9cd
4 changed files with 15 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/topics/releases/nitrogen.rst
View File

@ -132,6 +132,21 @@ Salt-SSH Deprecations
State Deprecations
------------------
The ``apache_conf`` state had the following functions removed:
- ``disable``: Please use ``disabled`` instead.
- ``enable``: Please use ``enabled`` instead.
The ``apache_module`` state had the following functions removed:
- ``disable``: Please use ``disabled`` instead.
- ``enable``: Please use ``enabled`` instead.
The ``apache_site`` state had the following functions removed:
- ``disable``: Please use ``disabled`` instead.
- ``enable``: Please use ``enabled`` instead.
- The ``chocolatey`` state had the following functions removed:
- ``install``: Please use ``installed`` instead.

38
salt/states/apache_conf.py
View File

@ -64,25 +64,6 @@ def enabled(name):
return ret
def enable(name):
'''
Ensure an Apache conf is enabled.
.. warning::
This function is deprecated and will be removed in Salt Nitrogen.
name
Name of the Apache conf
'''
salt.utils.warn_until(
'Nitrogen',
'apache_module.enable function has been renamed'
' apache_module.enabled and will be removed in Salt Nitrogen'
)
return enabled(name)
def disabled(name):
'''
Ensure an Apache conf is disabled.
@ -115,22 +96,3 @@ def disabled(name):
else:
ret['comment'] = '{0} already disabled.'.format(name)
return ret
def disable(name):
'''
Ensure an Apache conf is disabled.
.. warning::
This function is deprecated and will be removed in Salt Nitrogen.
name
Name of the Apache conf
'''
salt.utils.warn_until(
'Nitrogen',
'apache_module.disable function has been renamed'
' apache_module.disabled and will be removed in Salt Nitrogen'
)
return disabled(name)

37
salt/states/apache_module.py
View File

@ -68,25 +68,6 @@ def enabled(name):
return ret
def enable(name):
'''
Ensure an Apache module is enabled. This function is deprecated and will be
removed in Salt Nitrogen. Please use the ``enabled`` state function instead.
.. deprecated:: 2016.3.0
name
Name of the Apache module
'''
salt.utils.warn_until(
'Nitrogen',
'This functionality has been deprecated; use "apache_module.enabled" '
'instead.'
)
return enabled(name)
def disabled(name):
'''
Ensure an Apache module is disabled.
@ -121,21 +102,3 @@ def disabled(name):
else:
ret['comment'] = '{0} already disabled.'.format(name)
return ret
def disable(name):
'''
Ensure an Apache module is disabled.
.. deprecated:: 2016.3.0
name
Name of the Apache module
'''
salt.utils.warn_until(
'Nitrogen',
'This functionality has been deprecated; use "apache_module.disabled" '
'instead.'
)
return disabled(name)

38
salt/states/apache_site.py
View File

@ -64,25 +64,6 @@ def enabled(name):
return ret
def enable(name):
'''
Ensure an Apache site is enabled.
.. warning::
This function is deprecated and will be removed in Salt Nitrogen.
name
Name of the Apache site
'''
salt.utils.warn_until(
'Nitrogen',
'apache_module.enable function has been renamed'
' apache_module.enabled and will be removed in Salt Nitrogen'
)
return enabled(name)
def disabled(name):
'''
Ensure an Apache site is disabled.
@ -115,22 +96,3 @@ def disabled(name):
else:
ret['comment'] = '{0} already disabled.'.format(name)
return ret
def disable(name):
'''
Ensure an Apache site is disabled.
.. warning::
This function is deprecated and will be removed in Salt Nitrogen.
name
Name of the Apache site
'''
salt.utils.warn_until(
'Nitrogen',
'apache_module.disable function has been renamed'
' apache_module.disabled and will be removed in Salt Nitrogen'
)
return disabled(name)