Commit 1018a6f235056b461f2ba942a19e003cc2597753
Exists in
master
and in
39 other branches
Merge branch 'master' into notrac
Showing
6 changed files
with
30 additions
and
4 deletions
Show diff stats
puppet/modules.txt
puppet/modules/colab/manifests/cronmailman.pp
| @@ -3,4 +3,9 @@ class colab::cronmailman { | @@ -3,4 +3,9 @@ class colab::cronmailman { | ||
| 3 | content => template('colab/import_mailman_messages.erb'), | 3 | content => template('colab/import_mailman_messages.erb'), |
| 4 | ensure => present, | 4 | ensure => present, |
| 5 | } | 5 | } |
| 6 | + | ||
| 7 | + file { '/var/lock/colab': | ||
| 8 | + ensure => directory, | ||
| 9 | + owner => 'colab', | ||
| 10 | + } | ||
| 6 | } | 11 | } |
puppet/modules/colab/manifests/init.pp
| @@ -19,6 +19,18 @@ class colab ( | @@ -19,6 +19,18 @@ class colab ( | ||
| 19 | include postgresql::globals | 19 | include postgresql::globals |
| 20 | include postgresql::server | 20 | include postgresql::server |
| 21 | 21 | ||
| 22 | + user { 'colab': | ||
| 23 | + gid => 'colab', | ||
| 24 | + groups => ['sudo', 'mailman'], | ||
| 25 | + managehome => true, | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + group { 'mailman': | ||
| 29 | + ensure => present, | ||
| 30 | + system => true, | ||
| 31 | + before => User['colab'], | ||
| 32 | + } | ||
| 33 | + | ||
| 22 | postgresql::server::db { 'colab': | 34 | postgresql::server::db { 'colab': |
| 23 | user => 'colab', | 35 | user => 'colab', |
| 24 | password => 'colab', | 36 | password => 'colab', |
| @@ -67,4 +79,10 @@ class colab ( | @@ -67,4 +79,10 @@ class colab ( | ||
| 67 | directory => $colab::solr_project_path, | 79 | directory => $colab::solr_project_path, |
| 68 | user => 'colab', | 80 | user => 'colab', |
| 69 | } | 81 | } |
| 82 | + | ||
| 83 | + supervisor::app { 'mailmanapi': | ||
| 84 | + command => '/home/colab/.virtualenvs/colab/bin/mailman-api.py -b 127.0.0.1:9000', | ||
| 85 | + directory => '/home/colab/', | ||
| 86 | + user => 'colab', | ||
| 87 | + } | ||
| 70 | } | 88 | } |
requirements.txt
| 1 | -Django>=1.6.1,<1.7 | 1 | +Django>=1.6.7,<1.7 |
| 2 | South==0.8.1 | 2 | South==0.8.1 |
| 3 | psycopg2==2.5.1 | 3 | psycopg2==2.5.1 |
| 4 | django-piston==0.2.3 | 4 | django-piston==0.2.3 |
| @@ -53,3 +53,6 @@ diazo==1.0.5 | @@ -53,3 +53,6 @@ diazo==1.0.5 | ||
| 53 | # Dpaste | 53 | # Dpaste |
| 54 | # TODO: Pull-request to mainstream repository | 54 | # TODO: Pull-request to mainstream repository |
| 55 | git+https://github.com/interlegis/dpaste | 55 | git+https://github.com/interlegis/dpaste |
| 56 | + | ||
| 57 | +# Mailman 2 REST API | ||
| 58 | +mailman-api==0.2.1 |
src/colab/custom_settings.py
| @@ -261,7 +261,7 @@ FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator') | @@ -261,7 +261,7 @@ FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator') | ||
| 261 | 261 | ||
| 262 | 262 | ||
| 263 | ### Mailman API settings | 263 | ### Mailman API settings |
| 264 | -MAILMAN_API_URL = 'localhost:8000' | 264 | +MAILMAN_API_URL = 'http://localhost:9000' |
| 265 | 265 | ||
| 266 | 266 | ||
| 267 | ### BrowserID / Persona | 267 | ### BrowserID / Persona |
src/super_archives/models.py
| @@ -229,7 +229,7 @@ class Vote(models.Model): | @@ -229,7 +229,7 @@ class Vote(models.Model): | ||
| 229 | unique_together = ('user', 'message') | 229 | unique_together = ('user', 'message') |
| 230 | 230 | ||
| 231 | def __unicode__(self): | 231 | def __unicode__(self): |
| 232 | - return 'Vote on %s by %s' % (self.Message.id, | 232 | + return 'Vote on %s by %s' % (self.message.id, |
| 233 | self.user.username) | 233 | self.user.username) |
| 234 | 234 | ||
| 235 | 235 |