Skip to content

Commit

Permalink
The Onion Box v3.0RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphwetzel authored and ralphwetzel committed Sep 28, 2016
1 parent f5edfb1 commit 62872ed
Show file tree
Hide file tree
Showing 142 changed files with 24,164 additions and 4,377 deletions.
124 changes: 63 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,61 +1,63 @@
/.pypirc
/theonionbox/config/myonionbox.cfg
/.idea
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/
theonionbox/theonionbox.ltd
/theonionbox/scripts/jquery-1.12.2.min.map
/.pypirc
/theonionbox/config/myonionbox.cfg
/.idea
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
/xtor
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/
theonionbox/theonionbox.ltd
44 changes: 22 additions & 22 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015 ralphwetzel

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS 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.

The MIT License (MIT)
Copyright (c) 2015 ralphwetzel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS 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.
14 changes: 7 additions & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include README.md
include theonionbox/config/theonionbox.cfg
recursive-include theonionbox/css *.css
recursive-include theonionbox/pages *.html
recursive-include theonionbox/scripts *.js


include README.md
include theonionbox/config/theonionbox.cfg
recursive-include theonionbox/css *.css
recursive-include theonionbox/pages *.html
recursive-include theonionbox/scripts *.js
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ installed:
| NEW in v2 |
| --- |
| * [apscheduler](https://pypi.python.org/pypi/apscheduler)
| * [requests](https://pypi.python.org/pypi/requests)

Additionally I recommend to install [CherryPy](https://pypi.python.org/pypi/CherryPy) as webserver to be used!
(The Box runs as well with a standard server yet this one has issues with IE!)
| NEW in v3 |
| --- |
| ~~Additionally I recommend to install [CherryPy](https://pypi.python.org/pypi/CherryPy) as webserver to be used! |
| (The Box runs as well with a standard server yet this one has issues with IE!)~~ |

## Configuration
### ... of The Onion Box
Expand Down
56 changes: 28 additions & 28 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
from setuptools import setup, find_packages
# from distutils.core import setup

setup(
name='theonionbox',
version='0.0.1.dev3',
packages=['theonionbox'],
# package_dir={'theonionbox': 'theonionbox'},
# package_data={'theonionbox': ['config/theonionbox.cfg',
# 'pages/*.html',
# 'css/*.css',
# 'scripts/*.js']},
# packages=find_packages(),
include_package_data=True,
# zip_safe=False,
url='https://github.com/ralphwetzel/theonionbox',
license='MIT',
author='Ralph Wetzel',
author_email='[email protected]',
description='Web Interface for TOR relay',
install_requires=[
'psutil',
'configparser',
'stem',
'bottle>=0.12.8',
'cherrypy'
]
)
from setuptools import setup, find_packages
# from distutils.core import setup

setup(
name='theonionbox',
version='0.0.1.dev3',
packages=['theonionbox'],
# package_dir={'theonionbox': 'theonionbox'},
# package_data={'theonionbox': ['config/theonionbox.cfg',
# 'pages/*.html',
# 'css/*.css',
# 'scripts/*.js']},
# packages=find_packages(),
include_package_data=True,
# zip_safe=False,
url='https://github.com/ralphwetzel/theonionbox',
license='MIT',
author='Ralph Wetzel',
author_email='[email protected]',
description='Web Interface for TOR relay',
install_requires=[
'psutil',
'configparser',
'stem',
'bottle>=0.12.8',
'cherrypy'
]
)
Loading

0 comments on commit 62872ed

Please sign in to comment.