Merge branch 'master' into notrac

Sergio Oliveira
2 parents 1d92158c e290684b
Showing 6 changed files with 30 additions and 4 deletions Show diff stats
puppet/modules.txt
puppet/modules/colab/manifests/cronmailman.pp
puppet/modules/colab/manifests/init.pp
requirements.txt
src/colab/custom_settings.py
src/super_archives/models.py
-tracywebtech-appdeploy==0.8.8
+tracywebtech-appdeploy==0.8.10
 tracywebtech-security_updates==0.9.0
 tracywebtech-pip==1.3.2
  
@@ -3,4 +3,9 @@ class colab::cronmailman {
     content => template('colab/import_mailman_messages.erb'),
     ensure  => present,
   }
+
+  file { '/var/lock/colab':
+    ensure => directory,
+    owner  => 'colab',
+  }
 }
@@ -19,6 +19,18 @@ class colab (
   include postgresql::globals
   include postgresql::server
  
+  user { 'colab':
+    gid    => 'colab',
+    groups => ['sudo', 'mailman'],
+    managehome => true,
+  }
+
+  group { 'mailman':
+    ensure => present,
+    system => true,
+    before => User['colab'],
+  }
+
   postgresql::server::db { 'colab':
     user     => 'colab',
     password => 'colab',
@@ -67,4 +79,10 @@ class colab (
     directory => $colab::solr_project_path,
     user      => 'colab',
   }
+
+  supervisor::app { 'mailmanapi':
+    command   => '/home/colab/.virtualenvs/colab/bin/mailman-api.py -b 127.0.0.1:9000',
+    directory => '/home/colab/',
+    user      => 'colab',
+  }
 }
-Django>=1.6.1,<1.7
+Django>=1.6.7,<1.7
 South==0.8.1
 psycopg2==2.5.1
 django-piston==0.2.3
@@ -53,3 +53,6 @@ diazo==1.0.5
 # Dpaste
 # TODO: Pull-request to mainstream repository
 git+https://github.com/interlegis/dpaste
+
+# Mailman 2 REST API
+mailman-api==0.2.1
@@ -261,7 +261,7 @@ FEEDZILLA_SITE_DESCRIPTION = _(u&#39;Colab blog aggregator&#39;)
  
  
 ### Mailman API settings
-MAILMAN_API_URL = 'localhost:8000'
+MAILMAN_API_URL = 'http://localhost:9000'
  
  
 ### BrowserID / Persona
@@ -229,7 +229,7 @@ class Vote(models.Model):
         unique_together = ('user', 'message')
  
     def __unicode__(self):
-        return 'Vote on %s by %s' % (self.Message.id,
+        return 'Vote on %s by %s' % (self.message.id,
                                      self.user.username)
1		-tracywebtech-appdeploy==0.8.8
	1	+tracywebtech-appdeploy==0.8.10
2	2	tracywebtech-security_updates==0.9.0
3	3	tracywebtech-pip==1.3.2
4	4
...	...
...	...	@@ -3,4 +3,9 @@ class colab::cronmailman {
3	3	content => template('colab/import_mailman_messages.erb'),
4	4	ensure => present,
5	5	}
	6	+
	7	+ file { '/var/lock/colab':
	8	+ ensure => directory,
	9	+ owner => 'colab',
	10	+ }
6	11	}
...	...
...	...	@@ -19,6 +19,18 @@ class colab (
19	19	include postgresql::globals
20	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	34	postgresql::server::db { 'colab':
23	35	user => 'colab',
24	36	password => 'colab',
...	...	@@ -67,4 +79,10 @@ class colab (
67	79	directory => $colab::solr_project_path,
68	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	}
...	...
1		-Django>=1.6.1,<1.7
	1	+Django>=1.6.7,<1.7
2	2	South==0.8.1
3	3	psycopg2==2.5.1
4	4	django-piston==0.2.3
...	...	@@ -53,3 +53,6 @@ diazo==1.0.5
53	53	# Dpaste
54	54	# TODO: Pull-request to mainstream repository
55	55	git+https://github.com/interlegis/dpaste
	56	+
	57	+# Mailman 2 REST API
	58	+mailman-api==0.2.1
...	...
...	...	@@ -261,7 +261,7 @@ FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator')
261	261
262	262
263	263	### Mailman API settings
264		-MAILMAN_API_URL = 'localhost:8000'
	264	+MAILMAN_API_URL = 'http://localhost:9000'
265	265
266	266
267	267	### BrowserID / Persona
...	...
...	...	@@ -229,7 +229,7 @@ class Vote(models.Model):
229	229	unique_together = ('user', 'message')
230	230
231	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	233	self.user.username)
234	234
235	235
...	...