From 8caeb4d7c39c9e4a891435b44589ceb96c4bf7ab Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Sat, 19 Oct 2013 23:05:52 -0400 Subject: [PATCH] Removed abunch of junk --- alembic/env.pyc | Bin 1754 -> 0 bytes puppet/mercy/manifests/#init.pp# | 31 ----------- puppet/mercy/manifests/params.pp | 4 -- puppet/mercy/manifests/params.pp~ | 23 -------- puppet/mercy/templates/apache/vhost.erb~ | 12 ----- .../mercy/templates/python/alembic.ini.erb~ | 49 ------------------ 6 files changed, 119 deletions(-) delete mode 100644 alembic/env.pyc delete mode 100644 puppet/mercy/manifests/#init.pp# delete mode 100644 puppet/mercy/manifests/params.pp delete mode 100644 puppet/mercy/manifests/params.pp~ delete mode 100644 puppet/mercy/templates/apache/vhost.erb~ delete mode 100644 puppet/mercy/templates/python/alembic.ini.erb~ diff --git a/alembic/env.pyc b/alembic/env.pyc deleted file mode 100644 index 5068e060ba89c8a16dbcaa461391fd155dc0a857..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1754 zcmaKsUymC#5WvT~`QPL&oS-Ui?$a#-x|W1{?v7p`5^5wl##+ z6pB9l1hASxF$j|*;N8dY7NGeBaK;m1hk!?6Mu*Om5k;o|q)#Gf=8tH&)_$8guRK<0 zeWxFiKCi9E8=vs4{0R+cH`-#hZt5zd#kJn}9;tVAZMstvlGfVbSy&8dVK069oxP#7 zJfVpPC)JZ0tvs#QYeONP%Bn7KF_}pEe6!U~cHy=SI_bB_B417N)n(Z_FO~c@{W|Pdwve_a zjg?=93x7gK>UOg|Xe3!wd5$};E)9lLTWnA&C$G_%g_KWkrTbp*cG_-&!_Jb-8w}Bg zBiAU4+MareS7@b0EGUXEo__xPne?^1By(3v8}_ij$(b^S;;-+*U*HYqt;gge8Qf!~ zeekx?Y|;59xUX3kJi5HmJ1^_j?^?e%>KFm{gHa~mVs*P{8{=bA(f=|TaKU)km;0Ee z8}wPFw9V=rCq4}vjqmqRj{SQiT_VAf`9@i%a^4tNYg(HfY8I$T8IOd1-4NnY2CGY* ze~0#JvAgvTY4M*YvwfvMq!q_Z!}M6pqnXHg&ct%m0XhPUq4NUDD2y?qM*tFZ1Qa1$ z5@RAF7-?%cVBTH}@Ixp^Q1svx?d*delRgqZJ`M}ig?mD2*8>*BOKQRw7d+B|avF3O zB%LSROYUbH-UY1v53kQG)r$agIa<}|nvm+?;KDOM1jZej_rNOW>Rg94ro&=LdB^wP zfZx|VlyukNTHm+_9NnS(bkDA%b3-;gcl5!Y=lXlq1O(8lLV2}JW~59x$1l7_gUf>G_$J0@VYK*i(L{pu_?DgD1&x) vJ&^HZcer_&y{n5jouAU)*5GH{w2p1f#auiT^WL~O8w`fylkuaem_&a8_!gl$ diff --git a/puppet/mercy/manifests/#init.pp# b/puppet/mercy/manifests/#init.pp# deleted file mode 100644 index 28a67ba..0000000 --- a/puppet/mercy/manifests/#init.pp# +++ /dev/null @@ -1,31 +0,0 @@ -class mercy( - $environment, - $version, - $ensure, - $rabbitmq_uri, - $process_user => 'mercy', - $process_group => 'mercy', - $process_threads => 5, - $servername => $::fqdn, - $rabbitmq_user => 'mercy', - $rabbitmq_pw => 'mercy', - $rabbitmq_vhost => 'mercy', - $vhost_dir => '/etc/apache/httpd/conf.d', - $apache_service => 'httpd', - $port => 443, - $postgres_uri => 'localhost', - $postgres_user => 'mercy', - $postgres_pw => 'mercy', - $postgres_db => 'mercy') -{ - if ! defined(User[$process_user]) { - user { $process_user: - ensure => 'present' - } - } - if ! defined(Group[$process_group]) { - user { $process_group: - ensure => 'present' - } - } -} diff --git a/puppet/mercy/manifests/params.pp b/puppet/mercy/manifests/params.pp deleted file mode 100644 index 03c6d0e..0000000 --- a/puppet/mercy/manifests/params.pp +++ /dev/null @@ -1,4 +0,0 @@ -class mercy::params -{ - -} diff --git a/puppet/mercy/manifests/params.pp~ b/puppet/mercy/manifests/params.pp~ deleted file mode 100644 index 3f9e754..0000000 --- a/puppet/mercy/manifests/params.pp~ +++ /dev/null @@ -1,23 +0,0 @@ -class mercy::params ( $environment, - $version, - $ensure, - $rabbitmq_uri, - # ---- Everything below is optional - $process_user => 'mercy', - $process_group => 'mercy', - $process_threads => 5, - $servername => $::fqdn, - $rabbitmq_user => 'mercy', - $rabbitmq_pw => 'mercy', - $rabbitmq_vhost => 'mercy', - $vhost_dir => '/etc/apache/httpd/conf.d', - $apache_service => 'httpd', - $port => 443, - $postgres_uri => 'localhost', - $postgres_user => 'mercy', - $postgres_pw => 'mercy', - $postgres_db => 'mercy' - ) -{ - -} diff --git a/puppet/mercy/templates/apache/vhost.erb~ b/puppet/mercy/templates/apache/vhost.erb~ deleted file mode 100644 index ad3bc5f..0000000 --- a/puppet/mercy/templates/apache/vhost.erb~ +++ /dev/null @@ -1,12 +0,0 @@ -> - ServerName <%= scope.lookupvar('::fqdn') %> - WSGIDaemonProcess mercy user=<%= scope.lookupvar('::mercy::params::process_user') %> group=<%= scope.lookupvar('::mercy::params::process_group') %> threads=<%= scope.lookupvar('::mercy::params::process_threads') %> - WSGIScriptAlias / /opt/mercy/scripts/mercy.wsgi - - - WSGIProcessGroup mercy - WSGIApplicationGroup %{GLOBAL} - Order deny, allow - Allow from all - - \ No newline at end of file diff --git a/puppet/mercy/templates/python/alembic.ini.erb~ b/puppet/mercy/templates/python/alembic.ini.erb~ deleted file mode 100644 index 88a9e8a..0000000 --- a/puppet/mercy/templates/python/alembic.ini.erb~ +++ /dev/null @@ -1,49 +0,0 @@ -# A generic, single database configuration. - -[alembic] -# path to migration scripts -script_location = alembic - -# template used to generate migration files -# file_template = %%(rev)s_%%(slug)s - -# set to 'true' to run the environment during -# the 'revision' command, regardless of autogenerate -# revision_environment = false - -sqlalchemy.url = driver://mercy:mercy@postgresql.aklabs.net/mercy - -# Logging configuration -[loggers] -keys = root,sqlalchemy,alembic - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARN -handlers = console -qualname = - -[logger_sqlalchemy] -level = WARN -handlers = -qualname = sqlalchemy.engine - -[logger_alembic] -level = INFO -handlers = -qualname = alembic - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S