Remove unused slapos.recipe.lampgeneric

setup.py

@@ -64,7 +64,6 @@ setup(name=name,
       install_requires=[
         'enum34; python_version<"3.4"',  # for inotify-simple
         'jsonschema',
-        'hexagonit.recipe.download',
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
         'inotify_simple',

slapos/recipe/lampgeneric/__init__.py

-##############################################################################
-#
-# Copyright (c) 2013 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import shutil
-import os
-import zc.buildout
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class Recipe(GenericBaseRecipe):
-  # XXX-Cedric: write docstring
-
-  def install(self):
-    path_list = []
-
-    # Download and unpack application if not already existing
-    htdocs_location = self.options['htdocs']
-    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
-      try:
-        os.rmdir(htdocs_location)
-      except:
-        pass
-      self.download(htdocs_location)
-
-    # Install php.ini
-    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
-                                           'php.ini'),
-      self.substituteTemplate(self.getTemplateFilename('php.ini.in'),
-        dict(tmp_directory=self.options['tmp-dir']))
-    )
-    path_list.append(php_ini)
-
-    # Install apache
-    apache_config = dict(
-      pid_file=self.options['pid-file'],
-      lock_file=self.options['lock-file'],
-      ip=self.options['ip'],
-      port=self.options['port'],
-      error_log=self.options['error-log'],
-      access_log=self.options['access-log'],
-      document_root=self.options['htdocs'],
-      php_ini_dir=self.options['php-ini-dir'],
-    )
-    httpd_conf = self.createFile(self.options['httpd-conf'],
-      self.substituteTemplate(self.getTemplateFilename('apache.in'),
-                              apache_config)
-    )
-    path_list.append(httpd_conf)
-
-    wrapper = self.createWrapper(self.options['wrapper'],
-                                 (self.options['httpd-binary'],
-                                     '-f',
-                                     self.options['httpd-conf'],
-                                     '-DFOREGROUND'
-                                     ))
-    path_list.append(wrapper)
-
-
-    return path_list

slapos/recipe/lampgeneric/template/apache.in

-# Apache static configuration
-# Automatically generated
-
-# Basic server configuration
-PidFile "%(pid_file)s"
-Listen %(ip)s:%(port)s
-PHPINIDir %(php_ini_dir)s
-ServerAdmin someone@email
-DefaultType text/plain
-TypesConfig conf/mime.types
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-AddType application/x-httpd-php .php .phtml .php5 .php4
-AddType application/x-httpd-php-source .phps
-
-# Log configuration
-ErrorLog "%(error_log)s"
-LogLevel warn
-LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
-LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
-CustomLog "%(access_log)s" common
-
-# Directory protection
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Require all denied
-</Directory>
-
-<Directory %(document_root)s>
-  Options FollowSymLinks
-  AllowOverride All
-  Require all granted
-</Directory>
-DocumentRoot %(document_root)s
-DirectoryIndex index.html index.php
-
-# List of modules
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule php5_module modules/libphp5.so
-LoadModule alias_module modules/mod_alias.so

slapos/recipe/lampgeneric/template/php.ini.in

-[PHP]
-engine = On
-safe_mode = Off
-expose_php = Off
-error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
-display_errors = On
-display_startup_errors = Off
-log_errors = On
-log_errors_max_len = 1024
-ignore_repeated_errors = Off
-ignore_repeated_source = Off
-session.save_path = "%(tmp_directory)s"
-session.auto_start = 0
-date.timezone = Europe/Paris
-file_uploads = On
-upload_max_filesize = 8M
-post_max_size = 8M
-magic_quotes_gpc=Off

slapos/recipe/librecipe/generic.py

@@ -32,7 +32,6 @@ import os
 import sys
 import inspect
 import re
-import shutil
 import stat
 from six.moves.urllib.parse import quote
 import itertools
@@ -255,31 +254,3 @@ class GenericBaseRecipe(object):
     url = urlunparse((scheme, netloc, path, params, query, fragment))
 
     return url
-
-  def setLocationOption(self):
-    if not self.options.get('location'):
-      self.options['location'] = os.path.join(
-          self.buildout['buildout']['parts-directory'], self.name)
-
-  def download(self, destination=None):
-    """ A simple wrapper around h.r.download, downloading to self.location"""
-    self.setLocationOption()
-
-    import hexagonit.recipe.download
-    if not destination:
-      destination = self.location
-    if os.path.exists(destination):
-        # leftovers from a previous failed attempt, removing it.
-        self.logger.warning('Removing already existing directory %s',
-                            destination)
-        shutil.rmtree(destination)
-    os.mkdir(destination)
-
-    try:
-      options = self.options.copy()
-      options['destination'] = destination
-      hexagonit.recipe.download.Recipe(
-          self.buildout, self.name, options).install()
-    except:
-      shutil.rmtree(destination)
-      raise