Download as
Browse Code »

Commit e7d91a5ebee3f39b86e859a4a4ebca2eb4d3f556

Authored by Luan
2 parents 77401898 0ea3d8a1
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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

Showing 3 changed files with 12 additions and 12 deletions   Show diff stats
puppet/modules/colab/manifests/cronjobs.pp
  Diff comments   View file @e7d91a5
... ... @@ -47,15 +47,15 @@ class colab::cronjobs {
47 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
  Diff comments   View file @e7d91a5
... ... @@ -26,7 +26,6 @@ class colab {
26 26 exec { 'newaliases':
27 27 path => '/usr/bin/newaliases',
28 28 refreshonly => true,
29   - require => Class['postfix'],
30 29 }
31 30  
32 31 group { 'colab':
... ... @@ -44,6 +43,7 @@ class colab {
44 43 mailalias { 'colab':
45 44 ensure => present,
46 45 recipient => 'root',
  46 + require => Package['postfix'],
47 47 }
48 48  
49 49 file { 'colab-sudoers':
... ...
requirements.txt
  Diff comments   View file @e7d91a5
1   -Django>=1.6,<1.7
  1 +Django>=1.6.1,<1.7
2 2 South==0.8.1
3 3 psycopg2==2.5.1
4 4 django-piston==0.2.3
... ...