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 146faec5cf..0000000000 Binary files a/modules/lodgeit/files/header-bg2.png and /dev/null differ 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 %} - - -
- - - {# #} -
-

{{ 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 %> -