Merge lp:~danilo/linaro-license-protection/cleanup-and-readme into lp:~linaro-automation/linaro-license-protection/trunk

[Данило Шеган]

Remove unused code and cleanup README file (split out bits and pieces into
HACKING, INSTALL and a deployment README on http://bazaar.launchpad.net/~linaro-infrastructure/linaro-license-protection/configs/view/head:/README).

[Stevan Radaković (stevanr)]

Looking good.
Approve +1.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-06-26 13:51:02 +0000
+++ .bzrignore	2012-08-17 15:13:22 +0000
@@ -1,2 +1,4 @@
 .testrepository
 licenses.sqlite3
+licenses.db
+static

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2012-08-17 15:13:22 +0000
@@ -0,0 +1,96 @@
+Linaro publishing platform development
+======================================
+
+Dependencies
+------------
+
+ * python (>=2.7, untested with python3)
+ * python-beautifulsoup
+ * python-html2text,
+ * python-mock
+ * python-subunit
+ * testrepository (>=0.0.6)
+
+Code structure
+--------------
+
+ * license_protected_downloads/
+
+   Django application doing the file serving for Linaro publishing platform
+
+ * templates/, templates_releases/, templates_snapshots/
+
+   Default and overriding templates for several web sites we run this
+   code on.
+
+ * sampleroot/
+
+   Sample root, helpful for development testing.
+   Contains all possible combinations of options that are supported.
+
+ * scripts/
+
+   Contains a script for moving files from one location to the public
+   location (publish_to_snapshots.py) and a deployment-helper script
+   (update-deployment.py).
+
+   jenkins-post-www.sh is an obsolete script replaced by
+   publish_to_snapshots.
+
+Style
+-----
+
+https://wiki.linaro.org/Platform/Infrastructure/CodingStyle
+
+Upload system
+-------------
+
+Upload system deals with files in a private location and moves them into
+a corresponding subdirectory under the public location (being served through
+the web site).
+
+Script that does that lives in
+
+  scripts/publish_to_snapshots.py
+
+The important concept here is that of "build types": they define what target
+directory a build will end up in, and what, if any, postprocessing to do on it.
+
+A simple 'openembedded' job type is added with the following change:
+
+  https://code.launchpad.net/~fboudra/linaro-license-protection/openembedded-support-lp1032134/+merge/118060
+
+Web site for downloads
+----------------------
+
+This is a django application, so standard django steps apply:
+
+ ./manage.py syncdb
+ ./manage.py collectstatic
+ ./manage.py runserver
+
+Run tests with
+
+ ./manage.py test
+
+Overriding templates for particular hosts
+.........................................
+
+There is already support for providing separate templates for
+releases.linaro.org and snapshots.linaro.org.  Simply put them
+inside one of
+
+  templates_releases/
+  templates_snapshots/
+
+using the same names as in templates/, and they will be given
+preference under appropriate subdomains.
+
+staging instances
+.................
+
+lp:linaro-license-protection code gets automatically rolled out every
+half an hour to
+
+  staging.snapshots.linaro.org
+  staging.releases.linaro.org

=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2012-08-17 15:13:22 +0000
@@ -0,0 +1,78 @@
+Linaro publishing platform installation
+=======================================
+
+Linaro publishing platform currently consists of two separate parts:
+
+ * upload system
+ * web site for downloads
+
+
+Dependencies
+------------
+
+ * python
+ * apache2
+ * libapache2-mod-python
+ * libapache2-mod-xsendfile (>=0.10)
+ * python-django (>=1.3.1)
+ * python-django-openid
+
+To do development, you need a few more dependencies.  Please check the
+HACKING file.
+
+
+Tests
+-----
+
+Testing infrastructure is based on 'testrepository' and requires at least
+Python and Apache2:
+
+To run tests for upload system and helper scripts:
+
+  $ testr init
+  $ testr run
+
+To run tests for Django application:
+
+  $ python manage.py test
+
+Test plans
+..........
+
+To run the test plans from testplans/ subdirectory against
+snapshots.linaro.org and releases.linaro.org, execute the following:
+
+  $ testr init
+  $ testr run testplans.test_suite
+
+These tests require an internet connection.
+
+
+Deployment
+----------
+
+For current Linaro deployment, please see
+
+  http://bazaar.launchpad.net/~linaro-infrastructure/linaro-license-protection/configs/view/head:/README
+
+
+Upload system
+-------------
+
+Upload system deals with files in a private location and moves them into
+a corresponding subdirectory under the public location (being served through
+the web site).
+
+Refer to the Linaro deployment document above to see an example setup.
+
+Web site for downloads
+----------------------
+
+This is a django application, so standard django steps apply:
+
+ ./manage.py syncdb
+ ./manage.py collectstatic
+ ./manage.py runserver
+
+A configuration with mod_wsgi is described in the Linaro deployment README
+(referred to above).

=== modified file 'README'
--- README	2012-08-13 11:08:01 +0000
+++ README	2012-08-17 15:13:22 +0000
@@ -1,117 +1,80 @@
-Linaro downloads license protection
-===================================
-
-Linaro builds sometimes contain "binary blobs"—pieces of binary-only code
+Linaro publishing platform
+==========================
+
+Linaro provides regular builds of Ubuntu, Android, OpenEmbedded, kernels,
+toolchains for supported ARM boards.  They all have slightly differing
+goals and purposes, and require slightly different publication rules.
+
+This code provides a django application allowing restricted and controlled
+access to any published results.  It also contains code which allows for
+publishing in according to structure that the django application requires.
+
+This code is behind snapshots.linaro.org and releases.linaro.org.
+
+Features
+--------
+ * makes use of the regular directory structure on disk
+ * click through licensing with each file potentially having a different
+   license/theme
+ * openid restrictions (by Launchpad teams)
+ * post-processing of all uploads (a script that manages uploads)
+ * per-IP pass-through (for automatic services like a test framework)
+
+Background
+----------
+This code originated as mod_rewrite hacks to provide click-through licensing
+for tarballs containing "binary blobs"—pieces of binary-only code
 which enable extra features like accelerated graphics or multimedia.
 These pieces are distributed under a separate license, and downloading
 images or collections containing them requires some sort of license
 protection.
 
-This code provides such license protection on the hosting web server:
-other parts of infrastructure need to properly integrate with it (see
-eg. android-build.linaro.org section).  At the moment, it's implemented as
-a click-through license acceptance on the server side with Apache+Django.
-
-To ensure and prove this keeps working, we are also using automated tests
-with this code.
-
-
-Setup
------
-
-This tree is the base for snapshots.linaro.org and releases.linaro.org www
-roots as served by Apache.  It uses Django and mod_xsendfile.
-
-Currently, if BUILD-INFO.txt is found in a directory it is parsed and
-information from that file is used to apply appropriate protection to the
-requested file, otherwise old-style EULA handling is used: if special EULA
-file is found then it is used for selecting license and theme for requested
-file, otherwise all directories/files containing either 'origen' or 'snowball'
-in the URL path are protected with appropriate license (Samsung or ST-E)
-click-through.
-
-Dependencies
-............
-
-libapache2-mod-xsendfile >= 0.10
-libapache2-mod-python
-python-django >= 1.3.1
-python-django-openid-auth
-
-Testing:
-  python 2.7, testrepository (>=0.0.6), python-html2text,
-  python-subunit, python-beautifulsoup, python-mock
-
-Deployment
-..........
-
-Please see
-
-  http://bazaar.launchpad.net/~linaro-infrastructure/linaro-license-protection/configs/view/head:/README
-
-
-Technical details
------------------
-
-releases.linaro.org
-...................
-
-Root directory for releases.linaro.org includes downloadable artifacts served
-by Apache and Django application.
-
-It allows a few hard-coded hosts to bypass the click-through protection,
-by their IPs:
-
- * android-build.linaro.org (50.17.250.69)
- * validation.linaro.org (213.123.120.124)
-
-Currently hosted on mombin.canonical.com.
-
-
-snapshots.linaro.org
-....................
-
-Same basic set-up as releases.linaro.org.
-
-Further, to allow android-build.linaro.org to push to snapshots.linaro.org
-www area directly, we set-up two different users on the system with SSH keys:
-
- * linaro-android-build-publish:
-
-   chrooted to /srv/snapshots.linaro.org/www/android/ and allows sftp
-   access to push files over;  home directory
-
- * linaro-android-build-publish-trigger:
-
-   limited to executing only a single command through
-   /etc/ssh/user-authorized-keys/linaro-android-build-publish-trigger
-
-     command="/home/android-build-linaro-trigger/scripts
-              /trigger-android-build-linaro.sh ${SSH_ORIGINAL_COMMAND#* }"
-
-   (this passes the arguments received from the remote end as well)
-
-   This script does a sudo to 'android-build-linaro' and then runs
-
-     /home/android-build-linaro/scripts/jenkins-post-sftp.sh
-
-   script which moves files from /android/.tmp/ into appropriate
-   build directory.  It expects "build_name/build_number" as command
-   line parameters.
-
-android-build.linaro.org
-........................
-
-Runs Jenkins and uses SFTP plugin to access the above two users.  Private
-keys live in
-
-  /home/ubuntu/snapshots-sync2/linaro-android-build-publish —
-    linaro-android-build-publish
-  /home/ubuntu/snapshots-sync2/linaro-android-build-publish-trigger —
-    linaro-android-build-publish-trigger
-
-To ensure serialization of steps, and allow LAVA submission, these happen as
-build steps, and not as publishing steps.
+However, over time, more and more features were added until a point where
+it was necessary to switch to a better framework for web application
+development such as apache+mod_python+django+mod_xsendfile.
+
+Installation and setup
+----------------------
+
+See INSTALL file.
+
+Publishing new builds
+---------------------
+
+To publish a new build, one should include a BUILD-INFO.txt file with
+the build artifacts (see below for the description of the BUILD-INFO.txt
+syntax).
+
+BUILD-INFO.txt file will allow one to specify the access restrictions
+(such as click-through licensing and OpenID-restrictions) and influence
+the display (such as license-theme) of a particular build.
+
+WARNING: if you want a build type to be protected by OpenID, you need to
+ensure that the appropriate team is added to the list of django groups
+in the database.  Only django admins can do that.
+
+Next step is to ensure that
+
+  scripts/publish_to_snapshots.py
+
+has support for your build type.  Builds are originally placed into
+a single, private location on the target server, and expect a run of
+the above script for them to be placed in the right area.  This script
+can (and should) do any post-processing and checks for your build before
+it is placed in the public area for downloading.
+
+Your jenkins job (or whatever is doing the build and pushing the artifacts)
+should use push-over-ssh to push the builds to the server first, and then
+trigger a run of "scripts/publish_to_snapshots.py" with appropriate parameters
+to get it placed under the relevant subtree.
+
+This ensures that no incomplete files are ever offered for download, and
+allows postprocessing in a secure and controlled manner.
+
+After that, if scripts/publish_to_snapshots.py is configured to push
+to the right location, your build files should show up on the host
+running the django application.  BUILD-INFO configuration will take effect,
+so it may be inaccessible to the general public.
 
 
 Build-Info support
@@ -191,31 +154,3 @@
 If no BUILD-INFO.txt is found it falls back to per-file/per-directory EULA
 protection.
 
-
-Tests
------
-
-Testing infrastructure is based on 'testrepository' and requires at least
-Python and Apache2:
-
-To run tests for publisher:
-
-  $ testr init
-  $ testr run
-
-To run tests for Django application:
-
-  $ python manage.py test
-
-Test plans
-..........
-
-To run the test plans from testplans/ subdirectory against
-snapshots.linaro.org and releases.linaro.org, execute the following:
-
-  $ testr init
-  $ testr run testplans.test_suite
-
-These tests require an internet connection.
-
-

=== modified file 'license_protected_downloads/tests/test_pep8.py'
--- license_protected_downloads/tests/test_pep8.py	2012-07-11 11:56:10 +0000
+++ license_protected_downloads/tests/test_pep8.py	2012-08-17 15:13:22 +0000
@@ -32,6 +32,7 @@
         proc = subprocess.Popen(['pep8',
             '--repeat',
             '--ignore=%s' % ','.join(ignore),
+            '--exclude=static',
             '.'],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE)

=== removed directory 'licenses'
=== removed file 'licenses/Samsung-LinaroCustomer_EULA_draft_v2_E.doc'
Binary files licenses/Samsung-LinaroCustomer_EULA_draft_v2_E.doc	2011-12-09 12:24:29 +0000 and licenses/Samsung-LinaroCustomer_EULA_draft_v2_E.doc	1970-01-01 00:00:00 +0000 differ
=== removed file 'licenses/linaro.txt'
--- licenses/linaro.txt	2012-04-24 08:33:00 +0000
+++ licenses/linaro.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Linaro license.
\ No newline at end of file

=== removed file 'licenses/samsung.txt'
--- licenses/samsung.txt	2012-06-20 14:33:00 +0000
+++ licenses/samsung.txt	1970-01-01 00:00:00 +0000
@@ -1,268 +0,0 @@
-SAMSUNG DEVELOPMENT TOOL KIT END-USER LICENSE AGREEMENT FOR LINARO
-DEVELOPERS (“Agreement”)
-
-<p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
-
-<p>
-  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
-  legal entity, (“LICENSEE”) AND SAMSUNG ELECTRONICS CO.,
-  LTD. (“SAMSUNG”). BY CLICKING THE "ACCEPT" BUTTON, OR BY DOWNLOADING OR
-  INSTALLING OR OTHERWISE USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE
-  TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS
-  AGREEMENT OR ARE NOT AUTHORISED TO ACCEPT AND AGREE TO THE TERMS OF THE
-  AGREEMENT ON BEHALF OF YOUR LEGAL ENTITY, DO NOT DOWNLOAD, INSTALL OR
-  OTHERWISE USE THE SOFTWARE.
-</p>
-
-
-<h2>1. DEFINITIONS.</h2>
-<p>
-  <strong>1.1 <em>"Samsung Product"</em></strong> means any of integrated
-  circuit product(s),  including but not limited to system on chip products,
-  made by or for Samsung with which the Software was designed to be used.
-</p>
-
-<p>
-  <strong>1.2 <em>"Software"</em></strong> shall mean the software in binary form
-  and all other machine readable materials that are included with such
-  software or intended for use with it, including (a) any updates or error
-  corrections and (b) any documentation including user manuals that you
-  obtain from Samsung via on-line transmission through Linaro’s official websites.
-</p>
-
-<p>
-  <strong>1.3 <em>“Use”</em></strong> means in respect of the Software,
-  the use of (including copying the Software to the extent that such
-  copying is incidental to such use, including installation, backup and
-  execution) the Software, or any part thereof. Use shall specifically
-  exclude: (i) the translation, adaptation, arrangement or other
-  alteration of the Software except as allowed by local legislation
-  implementing Article 6 of the EC Directive on the legal protection of
-  computer programs (91/250/EEC) and then only to the extent necessary to
-  achieve interoperability of an independently created program with other
-  programs; and (ii) the adapting or reverse compiling of the Software for
-  the purpose of error correction.
-</p>
-
-
-<h2>2. LICENSE GRANT; OWNERSHIP</h2>
-
-<p>
-  <strong>2.1 License Grants.</strong> Subject to the terms and conditions
-  of this Agreement, Samsung hereby grants to Licensee, a non-exclusive,
-  non-transferable, limited license, to Use, without right to sublicense
-  or distribute, the Software, solely to the extent required in order to
-  develop and/or test Licensee software applications for use solely with
-  Samsung Product, and only if in compliance with all the provisions
-  herein.
-</p>
-
-<p>
-  <strong>2.2 Restriction on Modification.</strong> Licensee shall not
-  modify, alter, adapt, reverse engineer, decompile, disassemble the
-  Software or make any attempts to create non-licensed derivative works from
-  the Software and otherwise use the Software in any manner not specifically
-  authorized by this Agreement.
-</p>
-
-<p>
-  Licensee acknowledges that the Software may contain open source
-  software, subject to applicable open source licenses, provided by
-  Samsung for Licensee’s convenience. It is Licensee’s responsibility to
-  comply with the terms and conditions, including but not limited to any
-  modification rights, of those licenses. Source codes for these portions
-  of the Software may be obtained separately through applicable sources.
-</p>
-
-<p>
-  Except for those portions of the Software clearly specified as open
-  source, Licensee represents and warrants that it will not take any
-  action that would create obligations that would conflict with Licensee's
-  obligations hereunder, including without limitation, using the Software
-  to merge with, link to, make function calls to, or share data structures
-  with software available under an Open Source License Licensee shall
-  defend and indemnify Samsung against all liabilities, losses, damages,
-  costs and expenses relating to or arising out of a breach by Licensee of
-  the foregoing representation and warranty. Open Source Licenses
-  includes, without limitation, a software license that requires as a
-  condition of use, modification, and/or distribution of such software
-  that such software or other software incorporated into, derived from or
-  distributed with such software be (a) disclosed or distributed in source
-  code form; (b) be licensed for the purpose of making derivative works;
-  or (c) be redistributable at no charge.
-</p>
-
-<p>
-  <strong>2.3 Restriction on Distribution.</strong> Licensee shall not
-  distribute, rent, lease, and/or lend the Software and any copies thereof
-  to any third parties (individuals or legal entities).
-</p>
-
-<p>
-  <strong>2.4 Proprietary Notices.</strong>
-  Licensee shall not remove, efface or obscure any copyright or trademark
-  notices from the Software. Licensee shall include reproductions of the
-  Samsung copyright notice with each copy, if any, of the
-  Software. Licensee acknowledges that any symbols, trademarks, trade
-  names, and service marks adopted by Samsung to identify the Software
-  belong to Samsung and that Licensee shall have no rights therein.
-</p>
-
-<p>
-  <strong>2.5 Ownership.</strong>
-  Samsung and its licensors shall retain all right, title and interest,
-  including all intellectual property rights, in and to the
-  Software. Licensee hereby covenants that it will not assert any claim
-  that the Software infringes any intellectual property right owned or
-  controlled by Licensee.
-</p>
-
-<p>
-  <strong>2.6 No Other Rights Granted.</strong>
-  Apart from the license rights expressly set forth in this Agreement,
-  Samsung does not grant and Licensee does not receive any ownership
-  right, title or interest nor any security interest or other interest in
-  any intellectual property rights relating to the Software, nor in any
-  copy of any part of the foregoing.
-</p>
-
-
-<h2>3. NO WARRANTY OR SUPPORT</h2>
-
-<p>
-  <strong>3.1 No Warranty.</strong>
-  THE SOFTWARE IS OFFERED "AS IS." SAMSUNG AND ITS LICENSORS GRANT AND
-  LICENSEE RECEIVES NO WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, BY
-  STATUTE, COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE. SAMSUNG
-  SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THE
-  SOFTWARE. WITHOUT LIMITATION OF THE ABOVE, SAMSUNG DISCLAIMS ANY
-  WARRANTY THAT THE SOFTWARE IS BUG OR ERROR-FREE OR WILL OPERATE WITHOUT
-  INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE RESULTS
-  THEREFROM INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY OR
-  RELIABILITY.
-</p>
-
-<p>
-  <strong>3.2 No Support.</strong>
-  Nothing in this Agreement shall obligate Samsung to provide any support
-  for the Software. Samsung may, but shall be under no obligation to,
-  correct any defects in the Software and/or provide updates via Linaro’s
-  website. Licensee shall make reasonable efforts to promptly report to
-  Samsung any defects it finds in the Software, as an aid to creating
-  improved revisions of the Software.
-</p>
-
-<p>
-  <strong>3.3 Dangerous Applications.</strong>
-  The Software is not designed, intended, or certified for use in
-  components of systems intended for the operation of weapons, weapons
-  systems, nuclear installations, means of mass transportation, aviation,
-  life-support computers or equipment (including resuscitation equipment
-  and surgical implants), pollution control, hazardous substances
-  management, or for any other dangerous application in which the failure
-  of the Software could create a situation where personal injury or death
-  may occur. Licensee understands that use of the Software in such
-  applications is fully at the risk of Licensee.
-</p>
-
-
-<h2>4. TERM AND TERMINATION</h2>
-
-<p>
-  <strong>4.1 Term and Termination.</strong>
-  This Agreement is effective until terminated. Samsung may immediately
-  terminate and cancel this Agreement and the licenses granted hereunder
-  upon written notice to Licensee at any time with or without
-  cause. Licensee may terminate this Agreement at any time by (i)
-  completely removing the Software and any copies thereof from its system
-  and (ii) notifying in writing Samsung of Licensee’s intent to terminate
-  this Agreement.
-</p>
-
-<p>
-  <strong>4.2 Effect of Termination.</strong> Upon any termination of this
-  Agreement, the rights and licenses granted to Licensee under this
-  Agreement shall immediately terminate. Upon termination, Licensee shall
-  destroy all copies of the Software in its possession or control and
-  cease all use.
-</p>
-
-<p>
-  <strong>4.3 Survival.</strong> The provisions of Sections 1, 2.2, 2.3,
-  2.4, 2.5, 2.6, 3, 4, 5, and 6 shall survive the termination of this
-  Agreement.
-</p>
-
-<h2>5. LIMITATION OF LIABILITY</h2>
-
-<p>
-  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT SHALL SAMSUNG OR ANY OF
-  SAMSUNG'S LICENSORS BE LIABLE FOR ANY LOSS, DAMAGE OR INJURY, DIRECT AND
-  INDIRECT, INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED
-  AND ON ANY THEORY OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT
-  (INCLUDING NEGLIGENCE) OR OTHERWISE, ARISING OUT OF THIS AGREEMENT,
-  INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS SHALL APPLY
-  NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED
-  REMEDY. IN ADDITION TO THE FOREGOINGS, SAMSUNG HAS NO LIABILITY TO THE
-  LICENSEEE IF THE SOFTWARE INFRINGES OR IS ALLGEDED TO INFRINGE THE RIGHT
-  OF ANY THIRD PARTY.
-</p>
-
-<h2>6. MISCELLANEOUS</h2>
-
-<p>
-  <strong>6.1 Assignment.</strong> Licensee may not assign this Agreement
-  or any rights or obligation hereunder, directly or indirectly, by
-  operation of law or otherwise, without the prior written consent of
-  Samsung, and any such attempted assignment shall be void.
-</p>
-
-<p>
-  <strong>6.2 Governing Law; Venue.</strong>
-  This Agreement shall be governed by and construed in accordance with the
-  laws of the Republic of Korea, excluding conflict of laws provisions
-  which may direct the application of another jurisdiction’s laws and the
-  United Nations Convention on Contracts for the International Sale of
-  Goods. All disputes, controversies or differences which may arise out of
-  or in relation to or in connection with this Agreement, shall be shall
-  be submit to the jurisdiction of the Suwon Civil Court, Korea.
-</p>
-
-<p>
-  <strong>6.3 Severability.</strong>
-  All terms and provisions of this Agreement shall, if possible, be
-  construed in a manner which makes them valid, but in the event any term
-  or provision of this Agreement is found by a court of competent
-  jurisdiction to be illegal or unenforceable, the validity or
-  enforceability of the remainder of this Agreement shall not be affected
-  if the illegal or unenforceable provision does not materially affect the
-  intent of this Agreement. If the illegal or unenforceable provision
-  materially affects the intent of the parties to this Agreement, this
-  Agreement shall become terminated.
-</p>
-
-<p>
-  <strong>6.4 Equitable Relief.</strong>
-  Licensee hereby acknowledges that its breach of this Agreement would
-  cause irreparable harm and significant injury to Samsung that may be
-  difficult to ascertain and that a remedy at law would be
-  inadequate. Accordingly, Licensee agrees that Samsung shall have the
-  right to seek and obtain immediate injunctive relief to enforce
-  obligations under the Agreement in addition to any other rights and
-  remedies it may have.
-</p>
-
-<p>
-  <strong>6.5 Export Regulations.</strong>
-  Licensee agrees and warrants that it shall comply, at its own expense,
-  with any applicable export and import laws, restrictions, national
-  security controls and regulations.
-</p>
-
-<p>
-  <strong>6.6 Entire Agreement.</strong>
-  This Agreement sets forth the entire Agreement between Samsung and
-  Licensee relating to this subject matter.
-</p>

=== removed file 'middleware.py'
--- middleware.py	2012-08-06 11:53:16 +0000
+++ middleware.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-from django.conf import settings
-from django.utils.cache import patch_vary_headers
-
-
-class MultiHostMiddleware:
-
-    def process_request(self, request):
-        try:
-            host = request.META["HTTP_HOST"]
-            if host[-3:] == ":80":
-                host = host[:-3]  # ignore default port number, if present
-            request.urlconf = settings.HOST_MIDDLEWARE_URLCONF_MAP[host]
-        except KeyError:
-            pass  # use default urlconf (settings.ROOT_URLCONF)
-
-    def process_response(self, request, response):
-        if getattr(request, "urlconf", None):
-            patch_vary_headers(response, ('Host',))
-        return response

=== removed directory 'releases'
=== removed file 'releases_urls.py'
--- releases_urls.py	2012-08-01 13:46:32 +0000
+++ releases_urls.py	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-
-urlpatterns = patterns('',
-    # Uncomment the admin/doc line below to enable admin documentation:
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
-
-    url(r'^openid/', include('django_openid_auth.urls')),
-    url(r'^logout/$', 'django.contrib.auth.views.logout'),
-
-    # The license page...
-    url(r'^license$',
-        'license_protected_downloads.views.show_license',
-        name='show_license'),
-
-    # Exceptions redirected to root...
-    url(r'^license',
-        'license_protected_downloads.views.redirect_to_root',
-        name='redirect_to_root'),
-
-    # Accept the license
-    url(r'^accept-license',
-        'license_protected_downloads.views.accept_license',
-        name='accept_license'),
-
-    # Catch-all. We always return a file (or try to) if it exists.
-    # This handler does that.
-    url(r'(?P<path>.*)', 'license_protected_downloads.views.file_server'),
-)

=== renamed directory 'android' => 'sampleroot'
=== removed file 'scripts/jenkins-post-www.sh'
--- scripts/jenkins-post-www.sh	2012-05-04 17:44:47 +0000
+++ scripts/jenkins-post-www.sh	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/bash
-BASE_PATH=/home/android-build-linaro/android/.tmp
-TARGET_PATH=/srv/snapshots.linaro.org/www/android/
-
-# Expected argument: username_jobname/buildno
-build_path="$1"
-
-if [[ -n $2 ]]; then
-    BASE_PATH=$2
-fi
-
-if [[ -n $3 ]]; then
-    TARGET_PATH=$3
-fi
-
-if [ -z "$build_path" ]; then
-    echo "Missing build path"
-    exit 1;
-fi
-
-# Paranoid security - alarm on 2 dots separated only by 0 or more backslahes
-if echo "$build_path" | grep -q -E '\.\\*\.'; then
-    echo "No double-dots in build names please"
-    exit 1
-fi
-
-if [ ! -d $BASE_PATH/$build_path ]; then
-    echo "WARNING: Expected directory $BASE_PATH/$build_path does not exist"
-    exit 0
-fi
-
-job_dir=$(dirname $build_path)
-build_number=$(basename $build_path)
-username=`echo "$job_dir" | cut -d_ -f1`
-jobname=`echo "$job_dir" | cut -d_ -f2-`
-
-echo -n "Moving $BASE_PATH/$build_path to $TARGET_PATH/~$username/$jobname/... " &&
-(mkdir -p "$TARGET_PATH/~$username/$jobname" && \
-     cp -a $BASE_PATH/"$build_path" "$TARGET_PATH/~$username/$jobname/" && \
-     rm -rf $BASE_PATH/"$build_path" && \
-     echo "done")
-
-cd "$TARGET_PATH/~$username/$jobname/$build_number" && find * -xtype f > MANIFEST

=== removed file 'scripts/test_jenkins-post-www.sh_test_structure.sh'
--- scripts/test_jenkins-post-www.sh_test_structure.sh	2012-02-02 12:49:39 +0000
+++ scripts/test_jenkins-post-www.sh_test_structure.sh	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#/bin/env bash
-
-# Test MANIFEST creation for jenkins-post-www.sh
-
-root=`mktemp -d`
-
-mkdir -p $root/from/user_build/1/subdir/anotherdir/yetanotherdir
-touch $root/from/user_build/1/file1
-touch $root/from/user_build/1/file2
-touch $root/from/user_build/1/file3
-touch $root/from/user_build/1/subdir/subfile1
-touch $root/from/user_build/1/subdir/subfile2
-touch $root/from/user_build/1/subdir/subfile3
-
-mkdir -p $root/from/user_build/2/subdir/anotherdir/yetanotherdir
-touch $root/from/user_build/2/file1
-touch $root/from/user_build/2/file2
-touch $root/from/user_build/2/file3
-touch $root/from/user_build/2/subdir/subfile1
-touch $root/from/user_build/2/subdir/subfile2
-touch $root/from/user_build/2/subdir/subfile3
-
-mkdir -p $root/to
-
-./jenkins-post-www.sh user_build/1 $root/from $root/to
-
-# MANIFEST should list all files, but no directories, in $root/from/user_build/1
-
-cat > $root/expected << EOF
-file1
-file2
-file3
-subdir/subfile3
-subdir/subfile2
-subdir/subfile1
-EOF
-
-diff $root/expected $root/to/~user/build/1/MANIFEST
-if [[ $? == 0 ]]; then
-    echo "Passed"
-else
-    echo "Failed"
-fi
-
-rm -r $root

=== modified file 'settings.py'
--- settings.py	2012-08-17 08:37:26 +0000
+++ settings.py	2012-08-17 15:13:22 +0000
@@ -86,7 +86,6 @@
 )
 
 MIDDLEWARE_CLASSES = (
-    'middleware.MultiHostMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -151,14 +150,9 @@
     }
 }
 
-SERVED_PATHS = [os.path.join(PROJECT_ROOT, "android")]
+SERVED_PATHS = [os.path.join(PROJECT_ROOT, "sampleroot")]
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
     'django.contrib.auth.context_processors.auth',
 )
-
-HOST_MIDDLEWARE_URLCONF_MAP = {
-    "releases.linaro.org": ROOT_DIR + ".releases_urls",
-    "snapshots.linaro.org": ROOT_DIR + ".snapshots_urls",
-}

=== removed directory 'snapshots'
=== removed file 'snapshots_urls.py'
--- snapshots_urls.py	2012-08-01 13:46:32 +0000
+++ snapshots_urls.py	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-
-urlpatterns = patterns('',
-    # Uncomment the admin/doc line below to enable admin documentation:
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
-
-    url(r'^openid/', include('django_openid_auth.urls')),
-    url(r'^logout/$', 'django.contrib.auth.views.logout'),
-
-    # The license page...
-    url(r'^license$',
-        'license_protected_downloads.views.show_license',
-        name='show_license'),
-
-    # Exceptions redirected to root...
-    url(r'^license',
-        'license_protected_downloads.views.redirect_to_root',
-        name='redirect_to_root'),
-
-    # Accept the license
-    url(r'^accept-license',
-        'license_protected_downloads.views.accept_license',
-        name='accept_license'),
-
-    # Catch-all. We always return a file (or try to) if it exists.
-    # This handler does that.
-    url(r'(?P<path>.*)', 'license_protected_downloads.views.file_server'),
-)