| Index: tools/telemetry/third_party/gsutilz/third_party/boto/boto/pyami/installers/ubuntu/apache.py
|
| diff --git a/tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py b/tools/telemetry/third_party/gsutilz/third_party/boto/boto/pyami/installers/ubuntu/apache.py
|
| similarity index 53%
|
| copy from tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py
|
| copy to tools/telemetry/third_party/gsutilz/third_party/boto/boto/pyami/installers/ubuntu/apache.py
|
| index a70e6515e01f13e404e77ef814accaa5ba5c157e..febc2dfa25e1d06c6421ac8666525746cc0d48a8 100644
|
| --- a/tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py
|
| +++ b/tools/telemetry/third_party/gsutilz/third_party/boto/boto/pyami/installers/ubuntu/apache.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2014 Google Inc. All Rights Reserved.
|
| +# Copyright (c) 2008 Chris Moyer http://coredumped.org
|
| #
|
| # Permission is hereby granted, free of charge, to any person obtaining a
|
| # copy of this software and associated documentation files (the
|
| @@ -14,17 +14,30 @@
|
| # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
| # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
|
| # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
| -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
| +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
| # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
| # IN THE SOFTWARE.
|
| +#
|
| +from boto.pyami.installers.ubuntu.installer import Installer
|
|
|
| -from __future__ import absolute_import
|
| +class Apache(Installer):
|
| + """
|
| + Install apache2, mod_python, and libapache2-svn
|
| + """
|
|
|
| -# Import this module so that users can simply import the top-level module. Once
|
| -# imported, boto will pick up our subclasses of AuthHandler.
|
| -from gcs_oauth2_boto_plugin import oauth2_plugin
|
| + def install(self):
|
| + self.run("apt-get update")
|
| + self.run('apt-get -y install apache2', notify=True, exit_on_error=True)
|
| + self.run('apt-get -y install libapache2-mod-python', notify=True, exit_on_error=True)
|
| + self.run('a2enmod rewrite', notify=True, exit_on_error=True)
|
| + self.run('a2enmod ssl', notify=True, exit_on_error=True)
|
| + self.run('a2enmod proxy', notify=True, exit_on_error=True)
|
| + self.run('a2enmod proxy_ajp', notify=True, exit_on_error=True)
|
|
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetFallbackClientIdAndSecret
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetLock
|
| + # Hard reboot the apache2 server to enable these module
|
| + self.stop("apache2")
|
| + self.start("apache2")
|
|
|
| + def main(self):
|
| + self.install()
|
|
|