linaro-license-protection

Merge lp:~gesha/linaro-license-protection/readme-update into lp:~linaro-automation/linaro-license-protection/trunk

  1. readme-update
  2. Merge into trunk
Proposed by Georgy Redkozubov
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 88
Merged at revision: 89
Proposed branch: lp:~gesha/linaro-license-protection/readme-update
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 110 lines (+21/-30)
1 file modified
README (+21/-30)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/readme-update
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+116401@code.launchpad.net

Description of the change

This branch updates README file to reflect current state of the linaro-license-protection.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Hello Georgy,

I took a look at the merge proposal and the fixes looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2012-06-20 11:49:12 +0000
+++ README 2012-07-24 05:11:19 +0000
@@ -10,7 +10,7 @@
10This code provides such license protection on the hosting web server:10This code provides such license protection on the hosting web server:
11other parts of infrastructure need to properly integrate with it (see11other parts of infrastructure need to properly integrate with it (see
12eg. android-build.linaro.org section). At the moment, it's implemented as12eg. android-build.linaro.org section). At the moment, it's implemented as
13a click-through license acceptance on the Apache side.13a click-through license acceptance on the server side with Apache+Django.
1414
15To ensure and prove this keeps working, we are also using automated tests15To ensure and prove this keeps working, we are also using automated tests
16with this code.16with this code.
@@ -20,29 +20,27 @@
20-----20-----
2121
22This tree is the base for snapshots.linaro.org and releases.linaro.org www22This tree is the base for snapshots.linaro.org and releases.linaro.org www
23roots as served by Apache. It makes heavy use of mod_rewrite from within23roots as served by Apache. It uses Django and mod_xsendfile.
24the .htaccess file.
2524
26Currently, all directories/files containing either 'origen' or 'snowball'25Currently, if BUILD-INFO.txt is found in a directory it is parsed and
26information from that file is used to apply appropriate protection to the
27requested file, otherwise old-style EULA handling is used: if special EULA
28file is found then it is used for selecting license and theme for requested
29file, otherwise all directories/files containing either 'origen' or 'snowball'
27in the URL path are protected with appropriate license (Samsung or ST-E)30in the URL path are protected with appropriate license (Samsung or ST-E)
28click-through.31click-through.
2932
30Dependencies33Dependencies
31............34............
3235
33libapache2-mod-php536libapache2-mod-xsendfile >= 0.10
37python-django >= 1.3.1
38python-django-openid-auth
3439
35Testing:40Testing:
36 phpunit, python 2.7, testrepository (>=0.0.6), python-html2text,41 python 2.7, testrepository (>=0.0.6), python-html2text,
37 python-subunit, python-beautifulsoup42 python-subunit, python-beautifulsoup
3843
39Recent (as of 2012-05-08) Ubuntu/Debian releases have a broken phpunit
40package and thus require installation of phpunit through PEAR:
41
42 $ sudo apt-get install php-pear
43 $ sudo pear config-set auto_discover 1
44 $ sudo pear install pear.phpunit.de/PHPUnit
45
4644
47Technical details45Technical details
48-----------------46-----------------
@@ -50,8 +48,8 @@
50releases.linaro.org48releases.linaro.org
51...................49...................
5250
53Root directory for releases.linaro.org includes .htaccess and licenses/*.51Root directory for releases.linaro.org includes downloadable artifacts served
54It has mod_rewrite enabled.52by Apache and Django application.
5553
56It allows a few hard-coded hosts to bypass the click-through protection,54It allows a few hard-coded hosts to bypass the click-through protection,
57by their IPs:55by their IPs:
@@ -70,15 +68,15 @@
70Further, to allow android-build.linaro.org to push to snapshots.linaro.org68Further, to allow android-build.linaro.org to push to snapshots.linaro.org
71www area directly, we set-up two different users on the system with SSH keys:69www area directly, we set-up two different users on the system with SSH keys:
7270
73 * android-build-linaro:71 * linaro-android-build-publish:
7472
75 chrooted to /srv/snapshots.linaro.org/www/android/ and allows sftp73 chrooted to /srv/snapshots.linaro.org/www/android/ and allows sftp
76 access to push files over; home directory74 access to push files over; home directory
7775
78 * android-build-linaro-trigger:76 * linaro-android-build-publish-trigger:
7977
80 limited to executing only a single command through78 limited to executing only a single command through
81 /etc/ssh/user-authorized-keys/android-build-linaro-trigger79 /etc/ssh/user-authorized-keys/linaro-android-build-publish-trigger
8280
83 command="/home/android-build-linaro-trigger/scripts81 command="/home/android-build-linaro-trigger/scripts
84 /trigger-android-build-linaro.sh ${SSH_ORIGINAL_COMMAND#* }"82 /trigger-android-build-linaro.sh ${SSH_ORIGINAL_COMMAND#* }"
@@ -99,8 +97,10 @@
99Runs Jenkins and uses SFTP plugin to access the above two users. Private97Runs Jenkins and uses SFTP plugin to access the above two users. Private
100keys live in98keys live in
10199
102 /home/ubuntu/snapshots-sync/snapshots-sync — android-build-linaro100 /home/ubuntu/snapshots-sync2/linaro-android-build-publish —
103 /home/ubuntu/snapshots-sync/snapshots-filemove — android-build-linaro-trigger101 linaro-android-build-publish
102 /home/ubuntu/snapshots-sync2/linaro-android-build-publish-trigger —
103 linaro-android-build-publish-trigger
104104
105To ensure serialization of steps, and allow LAVA submission, these happen as105To ensure serialization of steps, and allow LAVA submission, these happen as
106build steps, and not as publishing steps.106build steps, and not as publishing steps.
@@ -204,13 +204,4 @@
204204
205These tests require an internet connection.205These tests require an internet connection.
206206
207Tests for PHP license-matching logic207
208....................................
209
210Unit tests for the license-matching logic written in PHP are automatically
211ran as part of the full test suite (testr run). However, for a more
212detailed output, you may need to run phpunit directly.
213
214To run the tests separately, do the following:
215
216 $ phpunit tests/LicenseHelperTest

Subscribers

People subscribed via source and target branches