Permalink
Browse files

License -> Apache 2

  • Loading branch information...
mpdehaan committed Nov 29, 2018
1 parent 127a6bb commit ebe44e3892e2a15467c4ad323228af60baa7470e
Showing with 101 additions and 216 deletions.
  1. +0 −23 LICENSE.md
  2. +1 −5 README.md
  3. +0 −1 docs/source/contents.rst
  4. +0 −87 docs/source/partnership.rst
  5. +1 −1 manage.py
  6. +1 −1 vespene/__init__.py
  7. +1 −1 vespene/admin.py
  8. +1 −1 vespene/common/__init__.py
  9. +1 −1 vespene/common/logger.py
  10. +1 −1 vespene/common/plugin_loader.py
  11. +1 −1 vespene/common/secrets.py
  12. +1 −1 vespene/common/templates.py
  13. +1 −1 vespene/common/variables.py
  14. +1 −1 vespene/config/__init__.py
  15. +1 −1 vespene/config/core.py
  16. +1 −1 vespene/config/database.py
  17. +1 −1 vespene/config/interface.py
  18. +1 −1 vespene/config/plugins.py
  19. +1 −1 vespene/config/workers.py
  20. +1 −1 vespene/management/__init__.py
  21. +1 −1 vespene/management/commands/__init__.py
  22. +1 −1 vespene/management/commands/autoscaler.py
  23. +1 −1 vespene/management/commands/cleanup.py
  24. +1 −1 vespene/management/commands/generate_secret.py
  25. +1 −1 vespene/management/commands/generate_supervisor.py
  26. +1 −1 vespene/management/commands/project_control.py
  27. +1 −1 vespene/management/commands/test_webhook.py
  28. +1 −1 vespene/management/commands/tutorial_setup.py
  29. +1 −1 vespene/management/commands/worker.py
  30. +1 −1 vespene/manager/__init__.py
  31. +1 −1 vespene/manager/jobkick.py
  32. +1 −1 vespene/manager/output.py
  33. +1 −1 vespene/manager/permissions.py
  34. +1 −1 vespene/manager/secrets.py
  35. +1 −1 vespene/manager/webhooks.py
  36. +1 −1 vespene/models/__init__.py
  37. +1 −1 vespene/models/base.py
  38. +1 −1 vespene/models/build.py
  39. +1 −1 vespene/models/organization.py
  40. +1 −1 vespene/models/pipeline.py
  41. +1 −1 vespene/models/project.py
  42. +1 −1 vespene/models/service_login.py
  43. +1 −1 vespene/models/snippet.py
  44. +1 −1 vespene/models/ssh_key.py
  45. +1 −1 vespene/models/stage.py
  46. +1 −1 vespene/models/variable_set.py
  47. +1 −1 vespene/models/worker.py
  48. +1 −1 vespene/models/worker_pool.py
  49. +1 −1 vespene/plugins/__init__.py
  50. +1 −1 vespene/plugins/authorization/__init__.py
  51. +1 −1 vespene/plugins/authorization/group_required.py
  52. +1 −1 vespene/plugins/authorization/ownership.py
  53. +1 −1 vespene/plugins/autoscale_executor/__init__.py
  54. +1 −1 vespene/plugins/autoscale_executor/shell.py
  55. +1 −1 vespene/plugins/autoscale_planner/__init__.py
  56. +1 −1 vespene/plugins/autoscale_planner/stock.py
  57. +1 −1 vespene/plugins/isolation/__init__.py
  58. +1 −1 vespene/plugins/isolation/basic_container.py
  59. +1 −1 vespene/plugins/isolation/sudo.py
  60. +1 −1 vespene/plugins/organizations/github.py
  61. +1 −1 vespene/plugins/output/timestamp.py
  62. +1 −1 vespene/plugins/scm/__init__.py
  63. +1 −1 vespene/plugins/scm/git.py
  64. +1 −1 vespene/plugins/scm/none.py
  65. +1 −1 vespene/plugins/scm/svn.py
  66. +1 −1 vespene/plugins/secrets/basic.py
  67. +1 −1 vespene/plugins/triggers/__init__.py
  68. +1 −1 vespene/plugins/triggers/command.py
  69. +1 −1 vespene/plugins/triggers/slack.py
  70. +1 −1 vespene/plugins/variables/__init__.py
  71. +1 −1 vespene/plugins/variables/common.py
  72. +1 −1 vespene/plugins/variables/pipelines.py
  73. +1 −1 vespene/plugins/variables/snippets.py
  74. +1 −1 vespene/settings.py
  75. +1 −1 vespene/views/__init__.py
  76. +1 −1 vespene/views/build.py
  77. +1 −1 vespene/views/fileserving.py
  78. +1 −1 vespene/views/forms.py
  79. +1 −1 vespene/views/group.py
  80. +1 −1 vespene/views/organization.py
  81. +1 −1 vespene/views/pipeline.py
  82. +1 −1 vespene/views/project.py
  83. +1 −1 vespene/views/service_login.py
  84. +1 −1 vespene/views/snippet.py
  85. +1 −1 vespene/views/ssh_key.py
  86. +1 −1 vespene/views/stage.py
  87. +1 −1 vespene/views/urls.py
  88. +1 −1 vespene/views/user.py
  89. +1 −1 vespene/views/variable_set.py
  90. +1 −1 vespene/views/view_helpers.py
  91. +1 −1 vespene/views/worker_pool.py
  92. +1 −1 vespene/workers/__init__.py
  93. +1 −1 vespene/workers/builder.py
  94. +1 −1 vespene/workers/commands.py
  95. +1 −1 vespene/workers/daemon.py
  96. +1 −1 vespene/workers/importer.py
  97. +1 −1 vespene/workers/isolation.py
  98. +1 −1 vespene/workers/pipelines.py
  99. +1 −1 vespene/workers/registration.py
  100. +1 −1 vespene/workers/scheduler.py
  101. +1 −1 vespene/workers/scm.py
  102. +1 −1 vespene/workers/ssh_agent.py
  103. +1 −1 vespene/workers/triggers.py
  104. +1 −1 vespene/wsgi.py
@@ -1,26 +1,3 @@
Commons Clause License Condition
================================
The Software is provided to you by the Licensor under the License,
as defined below, subject to the following condition.
Without limiting other conditions in the License, the grant of rights
under the License will not include, and the License does not grant to
you, the right to Sell the Software.
For purposes of the foregoing, “Sell” means practicing any or all of
the rights granted to you under the License to provide to third
parties, for a fee or other consideration (including without
limitation fees for hosting or consulting/ support services related
to the Software), a product or service whose value derives, entirely
or substantially, from the functionality of the Software. Any license
notice or attribution required by the License must also include this
license condition notice.
Software: Vespene
License: Apache 2.0
Licensor: Michael DeHaan LLC
Apache License
==============
@@ -75,11 +75,7 @@ To keep things organized, the issue tracker is just for bug tickets and pull req
License
=======
The purpose of the Vespene community is come together to produce great software we can all use and share.
Michael DeHaan LLC (project leadership) does not produce commercial software around Vespene, paid plugins, or offer consulting, support, or hosting services around Vespene of any kind. There are no customer-only enterprise branches; everything is public and open for everyone.
Accordingly, Vespene is licensed with the Apache 2.0 license with the Commons Clause restriction, which means that you cannot charge for the software in any way without approval from Michael DeHaan LLC, and this includes paid consulting, support, or hosting services. To do these things, you can join the Vespene Partner Program - for small organizations, membership is completely free once approved. You can read more at
[docs.vespene.io/partnership.html](http://docs.vespene.io/partnership.html).
Vespene is Apache2 licensed.
Author
======
@@ -46,5 +46,4 @@
Development Setup <development_setup>
Development Guide <development_guide>
FAQ / Troubleshooting <faq>
Partnership Program <partnership>

This file was deleted.

Oops, something went wrong.
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
import os
import sys
@@ -1,3 +1,3 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# admin.py - sets up the django administrative interface forms at
# http://yourserver.example.com/admin, which requires superuser access
@@ -1,2 +1,2 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# logger.py - basic wrapper around Python standard logging just so in
# case we need to change this behavior it is all in one place
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# plugin_loader.py - generic mechanism to load plugins used by all
# types of plugins in Vespene. Some plugins return lists, others
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# secrets.py - cloaks and decloaks secrets
# --------------------------------------------------------------------------
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# jinja2_env.py - defines what functions are available to Jinja2 templates
# used by views.py. Templates are in 'jinja2/'.
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# variables.py - this encapsulates calls to the various 'variables' plugins
# and is used to generate variables in 'vespene.json' (a file written into
@@ -1,2 +1,2 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
import os
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# ---------------------------------------------------------------------------
# database.py: database settings
# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# ---------------------------------------------------------------------------
# interface.py - default settings for the UI
# ---------------------------------------------------------------------------
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# ---------------------------------------------------------------------------
# plugins.py - default plugin configuration - see web docs on plugins
# ---------------------------------------------------------------------------
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# ---------------------------------------------------------------------------
# workers.py - configuration related to worker setup. This file *CAN* be
# different per worker.
@@ -1,2 +1,2 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,2 +1,2 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -----------------------------------------------------
# runs autoscaling plugins to dynamically size worker pools
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
import glob
import os.path
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
import sys
import os
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# generate_supervisor.py - CLI command that is used by the setup shell
# scripts as mentioned in the web documentation to more easily generate
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# project_control.py - CLI command that can start or stop projects. This is
# mostly used for development testing and can be upgraded.
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# test_webhook.py - CLI command used in development to simulate a webhook
# from GitHub to test the webhook functionality. Of limited use
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# tutorial_setup.py - this is used manually or by the provided setup
# scripts to create some basic objects in Vespene that new users can play
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# worker.py - this is the management command that starts worker processes
# that work a given queue, and is typically involved by supervisor, configured
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
class Shared(object):
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# jobkick.py - support functions for starting/stopping builds from the view
# side of the house. All actual processing is handled by code in 'workers/'
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# output.py - applies all output plugins to a message. Output plugins
# can be used to format build output or also redirect it to additional
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# permissions.py - central point for all code to use to ask questions about
# what things are allowed. Just returns yes/no, does not raise exceptions.
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# secrets.py - uses plugins to symetrically encrypt/decrypt content
# in the database. All plugins in the configuration can be used to
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# -------------------------------------------------------------------------
# webhooks.py - implementation of webhook support. Right now this isn't
# pluggable and contains an implementation tested for GitHub and some
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# ---------------------------------------------------------------------------
# models.py: base class of all DB models, some minor utility functions
# models are smart objects that include behavior as well as representation
@@ -1,2 +1,2 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
# --------------------------------------------------------------------------
# build.py - a build is an execution of a project, involving optionally
# a checkout, and a definite execution of a templated build script. It has
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# organization.py - a model of an organization like GitHub organizations
# holding lots of repos for import
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# pipeline.py - model/behavior code for CI/CD pipelines
#---------------------------------------------------------------------------
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# project.py - model & behavior for projects, which involve a build
# script and sometimes a source code repo. Instances of projects
@@ -1,5 +1,5 @@
# Copyright 2018, Michael DeHaan LLC
# License: Apache License Version 2.0 + Commons Clause
# License: Apache License Version 2.0
#---------------------------------------------------------------------------
# service_login.py - a username/password combo, most likely for accessing
# a SCM like git when SSH keys are not used.
Oops, something went wrong.

0 comments on commit ebe44e3

Please sign in to comment.