From fd2699e6ac2fd75d4c56391d62929e10f4944750 Mon Sep 17 00:00:00 2001 From: Jonathan Harker Date: Thu, 18 Dec 2014 17:23:00 -0500 Subject: [PATCH] Split out lodgeit module Move the lodgeit module to its own project. Depends-On: I0fcba109f74ae6ff31eca50137a412f4da34c261 Change-Id: I44995767b2ddb9980caf353c0e46abcbaf889652 --- modules.env | 1 + modules/lodgeit/files/header-bg2.png | Bin 3670 -> 0 bytes modules/lodgeit/manifests/init.pp | 47 ------------ modules/lodgeit/manifests/site.pp | 71 ------------------ modules/lodgeit/templates/layout.html.erb | 87 ---------------------- modules/lodgeit/templates/manage.py.erb | 36 --------- modules/lodgeit/templates/upstart.erb | 8 -- 7 files changed, 1 insertion(+), 249 deletions(-) delete mode 100644 modules/lodgeit/files/header-bg2.png delete mode 100644 modules/lodgeit/manifests/init.pp delete mode 100644 modules/lodgeit/manifests/site.pp delete mode 100644 modules/lodgeit/templates/layout.html.erb delete mode 100644 modules/lodgeit/templates/manage.py.erb delete mode 100644 modules/lodgeit/templates/upstart.erb diff --git a/modules.env b/modules.env index 09afdf50b5..c80b0f3ffc 100644 --- a/modules.env +++ b/modules.env @@ -59,6 +59,7 @@ SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]= INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elasticsearch"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kibana"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-lodgeit"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master" diff --git a/modules/lodgeit/files/header-bg2.png b/modules/lodgeit/files/header-bg2.png deleted file mode 100644 index 146faec5cfe3773824f4caf39e4480e4974d10df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3670 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 diff --git a/modules/lodgeit/manifests/init.pp b/modules/lodgeit/manifests/init.pp deleted file mode 100644 index a0e18fe879..0000000000 --- a/modules/lodgeit/manifests/init.pp +++ /dev/null @@ -1,47 +0,0 @@ -# == Class: lodgeit -# -class lodgeit { - $packages = [ 'python-imaging', - 'python-jinja2', - 'python-pybabel', - 'python-werkzeug', - 'python-simplejson', - 'python-pygments'] - - include apache - - include pip - a2mod { 'proxy': - ensure => present, - } - a2mod { 'proxy_http': - ensure => present, - } - - package { $packages: - ensure => present, - } - - if ! defined(Package['python-mysqldb']) { - package { 'python-mysqldb': - ensure => present, - } - } - - package { 'SQLAlchemy': - ensure => present, - provider => pip, - require => Class[pip], - } - - file { '/srv/lodgeit': - ensure => directory, - } - - vcsrepo { '/tmp/lodgeit-main': - ensure => latest, - provider => git, - source => 'https://git.openstack.org/openstack-infra/lodgeit', - } - -} diff --git a/modules/lodgeit/manifests/site.pp b/modules/lodgeit/manifests/site.pp deleted file mode 100644 index 026a5846c6..0000000000 --- a/modules/lodgeit/manifests/site.pp +++ /dev/null @@ -1,71 +0,0 @@ -# == Define: site -# - -define lodgeit::site( - $port, - $db_password, - $db_host='locahost', - $db_user=$name, - $vhost_name="paste.${name}.org", - $image='') { - - include apache - - apache::vhost::proxy { $vhost_name: - port => 80, - dest => "http://localhost:${port}", - require => File["/srv/lodgeit/${name}"], - } - - file { "/etc/init/${name}-paste.conf": - ensure => present, - content => template('lodgeit/upstart.erb'), - replace => true, - require => Package[$::apache::params::apache_name], - notify => Service["${name}-paste"], - } - - file { "/srv/lodgeit/${name}": - ensure => directory, - recurse => true, - source => '/tmp/lodgeit-main', - } - - if $image != '' { - 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'), - } - - 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, - } - - service { "${name}-paste": - ensure => running, - provider => upstart, - require => Service[$::apache::params::apache_name], - } -} diff --git a/modules/lodgeit/templates/layout.html.erb b/modules/lodgeit/templates/layout.html.erb deleted file mode 100644 index 14a32a565b..0000000000 --- a/modules/lodgeit/templates/layout.html.erb +++ /dev/null @@ -1,87 +0,0 @@ - - - - {{ page_title|e }} | LodgeIt! - - - - - - - {%- if css %} - - {%- endif %} - - -
- - - {#
    - {% for lang, name in i18n_languages %} -
  • - - {{ lang }} - -
    • - {% endfor %} -
#} -
-

{{ 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/modules/lodgeit/templates/manage.py.erb b/modules/lodgeit/templates/manage.py.erb deleted file mode 100644 index e57e02445b..0000000000 --- a/modules/lodgeit/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/<%= @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/modules/lodgeit/templates/upstart.erb b/modules/lodgeit/templates/upstart.erb deleted file mode 100644 index 4b2cb47956..0000000000 --- a/modules/lodgeit/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 %> -