=== modified file 'debian/changelog' --- debian/changelog 2016-03-06 16:54:54 +0000 +++ debian/changelog 2016-03-07 14:26:11 +0000 @@ -12,6 +12,8 @@ * Allow 'dhcpd' to access /usr/sbin/maas-provision via sudoers file (LP: #1552775) * debian/extras/maas: Replace shell wrapper with python. (LP: #1553605) + * debian/extras/maas-{region,rack}: Replace maas-region-admin + and maas-provision, respectively (LP: #1553791) * debian/control: Depends on iproute2 instead. (LP: #1553647) -- Andres Rodriguez Mon, 01 Feb 2016 18:18:52 +0100 === modified file 'debian/extras/maas-provision' --- debian/extras/maas-provision 2015-12-09 02:18:13 +0000 +++ debian/extras/maas-provision 2016-03-07 14:26:11 +0000 @@ -2,54 +2,9 @@ # Copyright 2015 Canonical Ltd. This software is licensed under the # GNU Affero General Public License version 3 (see the file LICENSE). -from __future__ import ( - absolute_import, - print_function, - unicode_literals, -) - -str = None - -__metaclass__ = type -__all__ = [] - -import grp -import os - - -def check_user(): - # At present, only root should execute this. - if os.getuid() != 0: - raise SystemExit("This utility may only be run as root.") - - -def set_group(): - # Ensure that we're running as the `maas` group. - try: - gr_maas = grp.getgrnam("maas") - except KeyError: - raise SystemExit("No such group: maas") - else: - os.setegid(gr_maas.gr_gid) - - -def set_umask(): - # Prevent creation of world-readable (or writable, executable) files. - os.umask(0o007) - - -def run(): - # Run the main provisioning script. - from provisioningserver.__main__ import main - main() - - -def main(): - check_user() - set_group() - set_umask() - run() - - -if __name__ == "__main__": - main() +import sys + +sys.stderr.write(""" + WARNING: The maas-provision command is deprecated and will be removed in a future + version. From now on please use 'maas-rack' instead. +""") === added file 'debian/extras/maas-rack' --- debian/extras/maas-rack 1970-01-01 00:00:00 +0000 +++ debian/extras/maas-rack 2016-03-07 14:26:11 +0000 @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +# Copyright 2015 Canonical Ltd. This software is licensed under the +# GNU Affero General Public License version 3 (see the file LICENSE). + +from __future__ import ( + absolute_import, + print_function, + unicode_literals, +) + +str = None + +__metaclass__ = type +__all__ = [] + +import grp +import os + + +def check_user(): + # At present, only root should execute this. + if os.getuid() != 0: + raise SystemExit("This utility may only be run as root.") + + +def set_group(): + # Ensure that we're running as the `maas` group. + try: + gr_maas = grp.getgrnam("maas") + except KeyError: + raise SystemExit("No such group: maas") + else: + os.setegid(gr_maas.gr_gid) + + +def set_umask(): + # Prevent creation of world-readable (or writable, executable) files. + os.umask(0o007) + + +def run(): + # Run the main provisioning script. + from provisioningserver.__main__ import main + main() + + +def main(): + check_user() + set_group() + set_umask() + run() + + +if __name__ == "__main__": + main() === added file 'debian/extras/maas-region' --- debian/extras/maas-region 1970-01-01 00:00:00 +0000 +++ debian/extras/maas-region 2016-03-07 14:26:11 +0000 @@ -0,0 +1,62 @@ +#!/usr/bin/python3 +# Copyright 2015 Canonical Ltd. This software is licensed under the +# GNU Affero General Public License version 3 (see the file LICENSE). + +from __future__ import ( + absolute_import, + print_function, + unicode_literals, +) + +str = None + +__metaclass__ = type +__all__ = [] + +import grp +import os +import sys + + +def check_user(): + # At present, only root should execute this. + if os.getuid() != 0: + raise SystemExit("This utility may only be run as root.") + + +def set_group(): + # Ensure that we're running as the `maas` group. + try: + gr_maas = grp.getgrnam("maas") + except KeyError: + raise SystemExit("No such group: maas") + else: + os.setegid(gr_maas.gr_gid) + + +def set_umask(): + # Prevent creation of world-readable (or writable, executable) files. + os.umask(0o007) + + +def run(): + # Force the production MAAS Django configuration. + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings") + + # The Django configuration lives outside of sys.path. + sys.path.append('/usr/share/maas') + + # Let Django do the rest. + from django.core import management + management.execute_from_command_line() + + +def main(): + check_user() + set_group() + set_umask() + run() + + +if __name__ == "__main__": + main() === modified file 'debian/extras/maas-region-admin' --- debian/extras/maas-region-admin 2015-12-09 02:18:13 +0000 +++ debian/extras/maas-region-admin 2016-03-07 14:26:11 +0000 @@ -2,61 +2,10 @@ # Copyright 2015 Canonical Ltd. This software is licensed under the # GNU Affero General Public License version 3 (see the file LICENSE). -from __future__ import ( - absolute_import, - print_function, - unicode_literals, -) - -str = None - -__metaclass__ = type -__all__ = [] - -import grp -import os import sys - -def check_user(): - # At present, only root should execute this. - if os.getuid() != 0: - raise SystemExit("This utility may only be run as root.") - - -def set_group(): - # Ensure that we're running as the `maas` group. - try: - gr_maas = grp.getgrnam("maas") - except KeyError: - raise SystemExit("No such group: maas") - else: - os.setegid(gr_maas.gr_gid) - - -def set_umask(): - # Prevent creation of world-readable (or writable, executable) files. - os.umask(0o007) - - -def run(): - # Force the production MAAS Django configuration. - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings") - - # The Django configuration lives outside of sys.path. - sys.path.append('/usr/share/maas') - - # Let Django do the rest. - from django.core import management - management.execute_from_command_line() - - -def main(): - check_user() - set_group() - set_umask() - run() - - -if __name__ == "__main__": - main() +sys.stderr.write(""" + WARNING: The maas-region-admin command is deprecated and will be removed in a future + version. From now on please use 'maas-region' instead. +""") +