Merge lp:~andrea.corbellini/beeseek/proxy-setup.py into lp:beeseek

Proposed by Andrea Corbellini
Status: Merged
Merged at revision: 41
Proposed branch: lp:~andrea.corbellini/beeseek/proxy-setup.py
Merge into: lp:beeseek
Diff against target: 61 lines (+37/-0)
3 files modified
.bzrignore (+1/-0)
trackers/proxy/Makefile (+5/-0)
trackers/proxy/setup.py (+31/-0)
To merge this branch: bzr merge lp:~andrea.corbellini/beeseek/proxy-setup.py
Reviewer Review Type Date Requested Status
Andrea Colangelo Approve
Lorenzo Allegrucci Approve
Review via email: mp+29538@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lorenzo Allegrucci (l-allegrucci) wrote :

ok as the previous one

review: Approve
Revision history for this message
Andrea Colangelo (warp10) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-07-08 07:22:54 +0000
+++ .bzrignore 2010-07-09 11:23:43 +0000
@@ -1,2 +1,3 @@
1node/beeseek/_version_info.py1node/beeseek/_version_info.py
2trackers/proxy/build/
2trackers/sniffer/beeseek-sniffer3trackers/sniffer/beeseek-sniffer
34
=== modified file 'trackers/proxy/Makefile'
--- trackers/proxy/Makefile 2010-07-08 07:03:54 +0000
+++ trackers/proxy/Makefile 2010-07-09 11:23:43 +0000
@@ -2,8 +2,13 @@
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4build:4build:
5 python3 setup.py build
6
7install: build
8 python3 setup.py install
59
6check:10check:
7 python3 ../../tools/test-proxy.py11 python3 ../../tools/test-proxy.py
812
9clean:13clean:
14 python3 setup.py clean
1015
=== added file 'trackers/proxy/setup.py'
--- trackers/proxy/setup.py 1970-01-01 00:00:00 +0000
+++ trackers/proxy/setup.py 2010-07-09 11:23:43 +0000
@@ -0,0 +1,31 @@
1#!/usr/bin/python3
2# Copyright 2010 BeeSeek Developers. This software is licensed under the
3# GNU Affero General Public License version 3 (see the file LICENSE).
4
5import os.path
6from distutils.core import setup
7
8setup(
9 name='BeeSeek Proxy',
10 version='1.1',
11 author='BeeSeek Developers',
12 author_email='feedback@beeseek.org',
13 url='http://www.beeseek.org/',
14 description='HTTP proxy that tracks the pages visited by the user',
15 long_description=
16 'This proxy works by injecting a JavaScript script in each page\n'
17 "visited by the user. This script tracks the user's actions and\n"
18 'sends the information to a node of the BeeSeek network, that will\n'
19 'store it anonymously in the database.\n',
20 download_url='https://launchpad.net/beeseek/+download',
21 classifiers=[
22 'Development Status :: 1 - Planning',
23 'Environment :: Web Environment',
24 'Intended Audience :: System Administrators',
25 'License :: OSI Approved :: GNU Affero General Public License v3',
26 'Operating System :: OS Independent',
27 'Topic :: Internet :: WWW/HTTP :: Indexing/Search'],
28 packages=[
29 path for path, _, files in os.walk('beeseekproxy')
30 if '__init__.py' in files],
31 scripts=['beeseek-proxy'])

Subscribers

People subscribed via source and target branches