diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ea90996..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Gemfile.lock -.bundled_gems/ -log/ -junit/ -.vagrant/ diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 019213a..0000000 --- a/Gemfile +++ /dev/null @@ -1,15 +0,0 @@ -source 'https://rubygems.org' - -if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper') - gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -else - gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -end -gem_checkout_method[:require] = false - -group :development, :test, :system_tests do - gem 'puppet-openstack_infra_spec_helper', - gem_checkout_method -end - -# vim:ft=ruby diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d645695..0000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index ce32a16..ec889a9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ -# OpenStack LodgeIt Module +This project is no longer maintained. -This module installs and configures LodgeIt +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". + +For any further questions, please email +service-discuss@lists.opendev.org or join #opendev on OFTC. diff --git a/Rakefile b/Rakefile deleted file mode 100644 index ff1f0d7..0000000 --- a/Rakefile +++ /dev/null @@ -1,8 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_autoloader_layout') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') -PuppetLint.configuration.send('disable_class_parameter_defaults') diff --git a/files/header-bg2.png b/files/header-bg2.png deleted file mode 100644 index 146faec..0000000 Binary files a/files/header-bg2.png and /dev/null differ diff --git a/files/robots.txt b/files/robots.txt deleted file mode 100644 index 1f53798..0000000 --- a/files/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: / diff --git a/manifests/init.pp b/manifests/init.pp deleted file mode 100644 index 4bf6a83..0000000 --- a/manifests/init.pp +++ /dev/null @@ -1,50 +0,0 @@ -# == Class: lodgeit -# -class lodgeit( - $lodgeit_version = 'master' - ) { - $packages = [ 'python-imaging', - 'python-jinja2', - 'python-pybabel', - 'python-werkzeug', - 'python-simplejson', - 'python-pygments'] - - include httpd - - include pip - httpd_mod { 'proxy': - ensure => present, - } - httpd_mod { 'proxy_http': - ensure => present, - } - - package { $packages: - ensure => present, - } - - if ! defined(Package['python-mysqldb']) { - package { 'python-mysqldb': - ensure => present, - } - } - - package { 'SQLAlchemy': - ensure => present, - provider => openstack_pip, - require => Class[pip], - } - - file { '/srv/lodgeit': - ensure => directory, - } - - vcsrepo { '/tmp/lodgeit-main': - ensure => latest, - revision => $lodgeit_version, - provider => git, - source => 'https://opendev.org/opendev/lodgeit', - } - -} diff --git a/manifests/mysql.pp b/manifests/mysql.pp deleted file mode 100644 index e42a5bc..0000000 --- a/manifests/mysql.pp +++ /dev/null @@ -1,31 +0,0 @@ -# == Class: puppet-lodgeit::mysql -# -class lodgeit::mysql( - $database_password, - $mysql_root_password, - $database_name = $name, - $database_user = $name, -) { - class { 'mysql::server': - root_password => $mysql_root_password, - override_options => { - 'mysqld' => { - 'default-storage-engine' => 'InnoDB', - } - } - } - include mysql::server::account_security - - mysql::db { $database_name: - user => $database_user, - password => $database_password, - host => 'localhost', - grant => ['all'], - charset => 'utf8', - require => [ - Class['mysql::server'], - Class['mysql::server::account_security'], - ], - } -} - diff --git a/manifests/site.pp b/manifests/site.pp deleted file mode 100644 index 90c7e96..0000000 --- a/manifests/site.pp +++ /dev/null @@ -1,101 +0,0 @@ -# == Define: site -# - -define lodgeit::site( - $db_password, - $port, - $db_host = 'localhost', - $db_name = $name, - $db_user = $name, - $image = undef, - $robotstxt = true, - $vhost_name = "paste.${name}.org", -) { - - include httpd - - ::httpd::vhost::proxy { $vhost_name: - port => 80, - dest => "http://localhost:${port}", - require => [File["/srv/lodgeit/${name}"], File["/srv/www/${name}"]], - proxyexclusions => ['/robots.txt'], - docroot => "/srv/www/${name}/" - } - - if versioncmp($::operatingsystemmajrelease, '16.04') >= 0 { - file { "/etc/systemd/system/${name}-paste.service": - ensure => present, - content => template('lodgeit/systemd.erb'), - replace => true, - require => Class['httpd'], - notify => Service["${name}-paste"], - } - } else { - file { "/etc/init/${name}-paste.conf": - ensure => present, - content => template('lodgeit/upstart.erb'), - replace => true, - require => Class['httpd'], - notify => Service["${name}-paste"], - } - } - - file { "/srv/lodgeit/${name}": - ensure => directory, - recurse => true, - source => '/tmp/lodgeit-main', - } - - if $image != undef { - file { "/srv/lodgeit/${name}/lodgeit/static/${image}": - ensure => present, - source => "puppet:///modules/lodgeit/${image}", - } - } - - file { "/srv/lodgeit/${name}/manage.py": - ensure => present, - mode => '0755', - replace => true, - content => template('lodgeit/manage.py.erb'), - notify => Service["${name}-paste"], - } - - file { "/srv/lodgeit/${name}/lodgeit/views/layout.html": - ensure => present, - replace => true, - content => template('lodgeit/layout.html.erb'), - } - - file { ['/srv/www', "/srv/www/${name}"]: - ensure => directory, - } - - if $robotstxt { - file { "/srv/www/${name}/robots.txt": - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - source => 'puppet:///modules/lodgeit/robots.txt', - require => File["/srv/www/${name}/"], - } - } - cron { "update_backup_${name}": - ensure => absent, - user => root, - } - - mysql_backup::backup_remote { $name: - database_host => $db_host, - database_user => $db_user, - database_password => $db_password, - num_backups => '10', - } - - service { "${name}-paste": - ensure => running, - enable => true, - require => Class['httpd'], - } -} diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 0f5e523..0000000 --- a/metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "openstackinfra-lodgeit", - "version": "0.0.1", - "author": "Openstack CI", - "summary": "Puppet module for LodgeIt", - "license": "Apache 2.0", - "source": "https://git.openstack.org/openstack-infra/puppet-lodgeit.git", - "project_page": "http://docs.openstack.org/infra/system-config/", - "issues_url": "https://storyboard.openstack.org/#!/project/759", - "dependencies": [] -} diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb deleted file mode 100644 index 01a2eb3..0000000 --- a/spec/acceptance/basic_spec.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'puppet-openstack_infra_spec_helper/spec_helper_acceptance' - -describe 'puppet-lodgeit module', :if => ['debian', 'ubuntu'].include?(os[:family]) do - def pp_path - base_path = File.dirname(__FILE__) - File.join(base_path, 'fixtures') - end - - def preconditions_puppet_module - module_path = File.join(pp_path, 'preconditions.pp') - File.read(module_path) - end - - def default_puppet_module - module_path = File.join(pp_path, 'default.pp') - File.read(module_path) - end - - before(:all) do - apply_manifest(preconditions_puppet_module, catch_failures: true) - end - - it 'should work with no errors' do - apply_manifest(default_puppet_module, catch_failures: true) - end - - it 'should be idempotent' do - pending('this module is not idempotent yet') - apply_manifest(default_puppet_module, catch_changes: true) - end - - describe 'required services' do - describe service('acceptance-paste') do - it { should be_running } - it { should be_enabled } - end - - describe command('curl --verbose http://localhost:8080') do - its(:stdout) { should include 'Acceptance Pastebin' } - end - end - -end diff --git a/spec/acceptance/fixtures/default.pp b/spec/acceptance/fixtures/default.pp deleted file mode 100644 index f3ab513..0000000 --- a/spec/acceptance/fixtures/default.pp +++ /dev/null @@ -1,7 +0,0 @@ -class { '::lodgeit': } - -lodgeit::site { 'acceptance': - db_password => '123456', - port => 8080, - image => 'header-bg2.png', -} diff --git a/spec/acceptance/fixtures/preconditions.pp b/spec/acceptance/fixtures/preconditions.pp deleted file mode 100644 index f69423f..0000000 --- a/spec/acceptance/fixtures/preconditions.pp +++ /dev/null @@ -1,16 +0,0 @@ -class { '::mysql::server': - root_password => $mysql_root_password, - override_options => { - 'mysqld' => { - 'default-storage-engine' => 'InnoDB', - } - } -} - -mysql::db { 'acceptance': - user => 'acceptance', - password => '123456', - host => 'localhost', - grant => ['all'], - require => Class['mysql::server'], -} diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 3bb3e62..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: git diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml deleted file mode 100644 index c552874..0000000 --- a/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-70-x64: - roles: - - master - platform: el-7-x86_64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml deleted file mode 100644 index 9fc624e..0000000 --- a/spec/acceptance/nodesets/nodepool-trusty.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml deleted file mode 100644 index 99dd318..0000000 --- a/spec/acceptance/nodesets/nodepool-xenial.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-16.04-amd64: - roles: - - master - platform: ubuntu-16.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/templates/layout.html.erb b/templates/layout.html.erb deleted file mode 100644 index 61cf0d5..0000000 --- a/templates/layout.html.erb +++ /dev/null @@ -1,87 +0,0 @@ - - - - {{ page_title|e }} | LodgeIt! - - - - - - - {%- if css %} - - {%- endif %} - - -
- - - {# #} -
-

{{ page_title|e }}

- {%- if new_replies %} -
-

{% trans %}Someone Replied To Your Paste{% endtrans %}

- {% for paste in new_replies %} -

{% trans date=paste.pub_date|datetimeformat, parent=paste.parent.paste_id, - paste=paste.paste_id, paste_url=paste.url|e, parent_url=paste.parent.url|e %} - on {{ date }} someone replied to your paste - #{{ parent }}, - in paste #{{ paste }}. Click here to {% endtrans %} - - {%- trans %}compare those two pastes{% endtrans %}. -

- {% endfor %} -

{% trans %}hide this notification{% endtrans %}

-
- {% elif request.first_visit %} -
-

{% trans %}Welcome On LodgeIt{% endtrans %}

-

{%- trans -%} - Welcome to the LodgeIt pastebin. In order to use the notification feature - a 31 day cookie with an unique ID was created for you. The lodgeit database - does not store any information about you, it's just used for an advanced - pastebin experience :-). Read more on the {% endtrans -%} - {% trans %}about lodgeit{% endtrans %} - {%- trans %} page. Have fun :-){%- endtrans -%} -

-

- {% trans %}hide this notification{% endtrans %} -

-
- {% endif -%} - {% block body %}{% endblock -%} -
-
-
- - diff --git a/templates/manage.py.erb b/templates/manage.py.erb deleted file mode 100644 index 81d7930..0000000 --- a/templates/manage.py.erb +++ /dev/null @@ -1,36 +0,0 @@ -import os - -from werkzeug import script, create_environ, run_wsgi_app -from werkzeug.serving import run_simple - -from lodgeit import local -from lodgeit.application import make_app -from lodgeit.database import session - -dburi = 'mysql://<%= @db_user %>:<%= @db_password %>@<%= @db_host %>:3306/<%= @db_name %>' - -SECRET_KEY = 'no secret key' - -def run_app(app, path='/'): - env = create_environ(path, SECRET_KEY) - return run_wsgi_app(app, env) - -action_runserver = script.make_runserver( - lambda: make_app(dburi, SECRET_KEY), - use_reloader=True) - -action_shell = script.make_shell( - lambda: { - 'app': make_app(dburi, SECRET_KEY, False, True), - 'local': local, - 'session': session, - 'run_app': run_app - }, - ('\nWelcome to the interactive shell environment of LodgeIt!\n' - '\n' - 'You can use the following predefined objects: app, local, session.\n' - 'To run the application (creates a request) use *run_app*.') -) - -if __name__ == '__main__': - script.run() diff --git a/templates/systemd.erb b/templates/systemd.erb deleted file mode 100644 index 214d775..0000000 --- a/templates/systemd.erb +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description="<%= @name %> Lodgeit server" -After=network-online.target - -[Service] -ExecStart=/usr/bin/python /srv/lodgeit/<%= @name %>/manage.py runserver -h 127.0.0.1 -p <%= @port %> - -[Install] -WantedBy=multi-user.target diff --git a/templates/upstart.erb b/templates/upstart.erb deleted file mode 100644 index 6ec857e..0000000 --- a/templates/upstart.erb +++ /dev/null @@ -1,8 +0,0 @@ -description "<%= @name %> Lodgeit server" -author "Andrew Hutchings " - -start on (local-filesystems and net-device-up) -stop on runlevel [!2345] - -exec python /srv/lodgeit/<%= @name %>/manage.py runserver -h 127.0.0.1 -p <%= @port %> -