Download as
Browse Code »

Commit ccb62cd97b892e2bae22dd2a03107f6484d123f2

Authored by Sergio Oliveira
1 parent 3e320281
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

Removed default nginx conf

Showing 2 changed files with 1 additions and 4 deletions   Show diff stats
puppet/hieradata/common.yaml
  Diff comments   View file @ccb62cd
@@ -23,4 +23,5 @@ colab::mailman_exclude_lists: @@ -23,4 +23,5 @@ colab::mailman_exclude_lists:
23 colab::hostnames: 23 colab::hostnames:
24 - colab.interlegis.leg.br 24 - colab.interlegis.leg.br
25 - colab.interlegis.gov.br 25 - colab.interlegis.gov.br
  26 + - localhost
26 colab::solr_project_path: '/home/colab/solr-4.6.1/colab' 27 colab::solr_project_path: '/home/colab/solr-4.6.1/colab'
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @ccb62cd
@@ -35,10 +35,6 @@ class colab ( @@ -35,10 +35,6 @@ class colab (
35 ensure => 'absent', 35 ensure => 'absent',
36 } 36 }
37 37
38 - file { '/etc/nginx/sites-enabled/default.conf':  
39 - ensure => 'absent',  
40 - }  
41 -  
42 $package_defaults = { 38 $package_defaults = {
43 before => Pip::Install['pyOpenSSL'], 39 before => Pip::Install['pyOpenSSL'],
44 } 40 }