Download as
Browse Code »

Commit 94c85deb4e54c14d16aa9bca58521f9023898ba8

Authored by Sergio Oliveira
Committed by Rodrigo Siqueira de Melo
1 parent 0247cf56
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

No need for postgresql setup 

Since this package is only used by spb and there is no colab
setup with local postgresql than this code is no longer needed.

Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 1 changed file with 2 additions and 22 deletions   Show diff stats
colab/colab.spec
  Diff comments   View file @94c85de
@@ -191,28 +191,8 @@ fi @@ -191,28 +191,8 @@ fi
191 191
192 mkdir -p /etc/colab/settings.d 192 mkdir -p /etc/colab/settings.d
193 193
194 -# only applies if there is a local PostgreSQL server  
195 -if [ -x /usr/bin/postgres ]; then  
196 -  
197 - # start/enable the service  
198 - postgresql-setup initdb || true  
199 - systemctl start postgresql  
200 - systemctl enable postgresql  
201 -  
202 - if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'colab';")" -eq 0 ]; then  
203 - # create user  
204 - sudo -u postgres -i createuser colab  
205 - fi  
206 -  
207 - if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(1) from pg_database where datname = 'colab';")" -eq 0 ]; then  
208 - # create database  
209 - sudo -u postgres -i createdb --owner=colab colab  
210 - fi  
211 ->>>>>>> Updated colab settings  
212 -  
213 - chown root:colab /etc/colab/settings.py  
214 - chmod 0640 /etc/colab/settings.py  
215 -fi 194 +chown root:colab /etc/colab/settings.py
  195 +chmod 0640 /etc/colab/settings.py
216 196
217 install -d -m 0755 -o colab -g colab /var/lib/colab-assets 197 install -d -m 0755 -o colab -g colab /var/lib/colab-assets
218 198