Commit e7d91a5ebee3f39b86e859a4a4ebca2eb4d3f556

Authored by Luan
2 parents 77401898 0ea3d8a1

Merge branch 'master' of github.com:TracyWebTech/colab

puppet/modules/colab/manifests/cronjobs.pp
@@ -47,15 +47,15 @@ class colab::cronjobs { @@ -47,15 +47,15 @@ class colab::cronjobs {
47 require => File['/mnt/mailman/'], 47 require => File['/mnt/mailman/'],
48 } 48 }
49 49
50 - cron { 'mount-sshfs':  
51 - command => 'test -e /mnt/mailman/archives/flag || sshfs root@listas.interlegis.gov.br:/var/lib/mailman/archives/private /mnt/mailman/archives/ -o ro,nosuid,nodev,max_read=65536,allow_other,IdentityFile=/root/.ssh/id_rsa && touch /mnt/mailman/archives/flag &> /dev/null',  
52 - minute => '*/5',  
53 - user => 'root',  
54 - require => [  
55 - File['/mnt/mailman/archives/'],  
56 - #File['root-ssh-private-key'],  
57 - Package['sshfs'],  
58 - ],  
59 - } 50 + #cron { 'mount-sshfs':
  51 + # command => 'test -e /mnt/mailman/archives/flag || sshfs root@listas.interlegis.gov.br:/var/lib/mailman/archives/private /mnt/mailman/archives/ -o ro,nosuid,nodev,max_read=65536,allow_other,IdentityFile=/root/.ssh/id_rsa && touch /mnt/mailman/archives/flag &> /dev/null',
  52 + # minute => '*/5',
  53 + # user => 'root',
  54 + # require => [
  55 + # File['/mnt/mailman/archives/'],
  56 + # #File['root-ssh-private-key'],
  57 + # Package['sshfs'],
  58 + # ],
  59 + #}
60 60
61 } 61 }
puppet/modules/colab/manifests/init.pp
@@ -26,7 +26,6 @@ class colab { @@ -26,7 +26,6 @@ class colab {
26 exec { 'newaliases': 26 exec { 'newaliases':
27 path => '/usr/bin/newaliases', 27 path => '/usr/bin/newaliases',
28 refreshonly => true, 28 refreshonly => true,
29 - require => Class['postfix'],  
30 } 29 }
31 30
32 group { 'colab': 31 group { 'colab':
@@ -44,6 +43,7 @@ class colab { @@ -44,6 +43,7 @@ class colab {
44 mailalias { 'colab': 43 mailalias { 'colab':
45 ensure => present, 44 ensure => present,
46 recipient => 'root', 45 recipient => 'root',
  46 + require => Package['postfix'],
47 } 47 }
48 48
49 file { 'colab-sudoers': 49 file { 'colab-sudoers':
requirements.txt
1 -Django>=1.6,<1.7 1 +Django>=1.6.1,<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