From ea25b28c5cfc9f5693f2679cd3d237e3aa61e934 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 17 Nov 2010 21:18:26 -0800 Subject: [PATCH 1/4] refactor splunk recipe --- chef/cookbooks/common/recipes/splunk.rb | 38 +++++++++++-------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/chef/cookbooks/common/recipes/splunk.rb b/chef/cookbooks/common/recipes/splunk.rb index 6e31c2d55..85a29b454 100644 --- a/chef/cookbooks/common/recipes/splunk.rb +++ b/chef/cookbooks/common/recipes/splunk.rb @@ -1,39 +1,35 @@ -execute "Download splunk" do - command "cd /tmp/install && wget 'http://www.splunk.com/index.php/download_track?file=4.1.5/linux/splunk-4.1.5-85165-Linux-x86_64.tgz&ac=&wget=true&name=wget&typed=releases'" -end +unless system "splunk status" + execute "Download splunk" do + command "cd /tmp/install && wget 'http://www.splunk.com/index.php/download_track?file=4.1.5/linux/splunk-4.1.5-85165-Linux-x86_64.tgz&ac=&wget=true&name=wget&typed=releases'" + end -execute "Untar splunk" do - command "cd /tmp/install && tar -xvf splunk-4.1.5-85165-Linux-x86_64.tgz" -end + execute "Untar splunk" do + command "tar -xvf /tmp/install/splunk-4.1.5-85165-Linux-x86_64.tgz -C /opt/" + end -execute "Stop old splunk" do - command "/opt/splunk/bin/splunk stop || true" -end - -execute "Remove old splunk" do - command "rm -rf /opt/splunk" -end - -execute "Install splunk" do - command "mv /tmp/install/splunk /opt/splunk" + link "/usr/local/bin/splunk" do + to "/opt/splunk/bin/splunk" + end end execute "Start splunk" do - command "cd /opt/splunk/bin && ./splunk start --accept-license" + command "splunk start --accept-license || true" end execute "Put splunk into forwarding mode" do - command "cd /opt/splunk/bin && ./splunk enable app SplunkLightForwarder -auth admin:changeme" + command "splunk enable app SplunkLightForwarder -auth admin:changeme" end execute "Add forwarding server" do - command "cd /opt/splunk/bin && ./splunk add forward-server splunk.joindiaspora.com:9997 -auth admin:changeme" + command "splunk add forward-server splunk.joindiaspora.com:9997 -auth admin:changeme" + not_if "splunk list forward-server | grep splunk.joindiaspora.com:9997" end execute "Add monitor for diaspora" do - command "cd /opt/splunk/bin && ./splunk add monitor /usr/local/app/diaspora/log" + command "splunk add monitor /usr/local/app/diaspora/log" + not_if "splunk list monitor | grep diaspora" end execute 'Splunk Restart' do - command "cd /opt/splunk/bin && ./splunk restart" + command "splunk restart" end From 9041a81feabdeafe20ec15a8c25e1c4d53064632 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 17 Nov 2010 21:20:28 -0800 Subject: [PATCH 2/4] cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing --- app/views/layouts/_header.html.haml | 31 +++++++++ app/views/layouts/application.html.haml | 71 ++++++++------------- app/views/shared/_stream_element.html.haml | 2 +- public/apple-touch-icon.png | Bin 0 -> 12719 bytes public/stylesheets/sass/application.sass | 7 ++ 5 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 app/views/layouts/_header.html.haml create mode 100644 public/apple-touch-icon.png diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml new file mode 100644 index 000000000..6696e331e --- /dev/null +++ b/app/views/layouts/_header.html.haml @@ -0,0 +1,31 @@ +-# Copyright (c) 2010, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + +.container{:style => "position:relative;"} + #diaspora_text + = link_to "DIASPORA*", (current_user ? root_path : new_user_session_path) + %span.sub_text + ALPHA + + - unless current_user + .right + %ul#landing_nav + %li= link_to "blog", "http://blog.joindiaspora.com" + %li= link_to "developers", "https://github.com/diaspora/diaspora" + %li= link_to "login", new_user_session_path + - else + #global_search + = form_tag(people_path, :method => 'get') do + = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5 + + %ul#user_menu + .avatar + = owner_image_tag + = link_to current_user.real_name, '#' + %li= link_to t('.view_profile'), current_user.person + %li= link_to t('.edit_profile'), edit_person_path(current_user.person) + %li= link_to t('.account_settings'), edit_user_path(current_user) + %li= link_to t('.logout'), destroy_user_session_path + + = render "shared/aspect_nav" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1140f6288..58e094573 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,37 +5,41 @@ !!! %html{:lang => I18n.locale.to_s} %head - %title - = "#{current_user.real_name} | diaspora" if current_user + %meta{:charset => 'utf-8'} - %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ + %title + - if current_user + = "#{current_user.real_name} | DIASPORA" + - else + DIASPORA + + %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'} + + %link{:rel => 'shortcut icon', :href => '/favicon.ico'} + %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'} = stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "blueprint/print", :media => 'print' - = stylesheet_link_tag "application", "ui" = stylesheet_link_tag "vendor/jquery.fancybox-1.3.1" = stylesheet_link_tag "vendor/fileuploader" = stylesheet_link_tag "vendor/tipsy" - - if current_user - %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"} - /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" - = javascript_include_tag 'vendor/jquery144.min', 'rails' + = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js' + :javascript + !window.jQuery && document.write(unescape('%3Cscript src="js/libs/jquery-1.4.4.js"%3E%3C/script%3E')) + + = javascript_include_tag 'rails' = javascript_include_tag 'vendor/jquery.infieldlabel' = javascript_include_tag 'vendor/jquery.tipsy' - = javascript_include_tag 'vendor/fancybox/jquery.fancybox-1.3.1.pack' = javascript_include_tag 'vendor/fileuploader' - = javascript_include_tag 'view', 'image-picker', 'stream' + = render 'js/websocket_js' if current_user - - if current_user - = render 'js/websocket_js' - - = csrf_meta_tag = yield(:head) + = csrf_meta_tag -if APP_CONFIG[:google_a_site] :javascript @@ -49,41 +53,17 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); + - if current_user + %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"} + %body + #notification + - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" %header - .container{:style => "position:relative;"} - - #notification - - #diaspora_text - = link_to "DIASPORA*", (current_user ? root_path : new_user_session_path) - %span.sub_text - ALPHA - - - unless current_user - .right - %ul#landing_nav - %li= link_to "blog", "http://blog.joindiaspora.com" - %li= link_to "developers", "https://github.com/diaspora/diaspora" - %li= link_to "login", new_user_session_path - - else - #global_search - = form_tag(people_path, :method => 'get') do - = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5 - - %ul#user_menu - .avatar - = owner_image_tag - = link_to current_user.real_name, '#' - %li= link_to t('.view_profile'), current_user.person - %li= link_to t('.edit_profile'), edit_person_path(current_user.person) - %li= link_to t('.account_settings'), edit_user_path(current_user) - %li= link_to t('.logout'), destroy_user_session_path - - = render "shared/aspect_nav" + = render 'layouts/header' .container .span-24.last @@ -104,12 +84,13 @@ var is_ssl = ("https:" == document.location.protocol); var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/"; document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E")); + :javascript var feedback_widget_options = {}; feedback_widget_options.display = "overlay"; feedback_widget_options.company = "diaspora"; - feedback_widget_options.placement = "left"; + feedback_widget_options.placement = "right"; feedback_widget_options.color = "#222"; feedback_widget_options.style = "idea"; var feedback_widget = new GSFN.feedback_widget(feedback_widget_options); diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index 36a17cd1d..7169158b8 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -20,7 +20,7 @@ - if current_user.owns?(post) .right - = render 'shared/reshare', :post => post if post.is_a? StatusMessage + = render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete" = render type_partial(post), :post => post diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1ccc5e3a9370d2ef197f30347298528d2999acec GIT binary patch literal 12719 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 NqA05>(;#gc`hNlnHgy01 literal 0 HcmV?d00001 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 610fbacc2..b371219dd 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -220,6 +220,11 @@ header :-moz-border-radius 5px :border-radius 5px + .stream_photo + img + :height 200px + :width 200px + .from :font @@ -885,6 +890,8 @@ h1.big_text img :display none + :height 100px + :width 100px .image_cycle From 2949dd8796a14434586f5d23605cfbadfe6cae0b Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Wed, 17 Nov 2010 21:34:47 -0800 Subject: [PATCH 3/4] cucumber feature for accepting a contact request. --- features/manages_contact_requests.feature | 6 +++--- features/step_definitions/custom_web_steps.rb | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/features/manages_contact_requests.feature b/features/manages_contact_requests.feature index f4157c373..876ea754e 100644 --- a/features/manages_contact_requests.feature +++ b/features/manages_contact_requests.feature @@ -6,10 +6,10 @@ Feature: managing contact requests And I have one contact request Scenario: seeing contact requests - When I am on the home page - Then I should see "Manage (1)" in the header + When I am on the home page + Then I should see "Manage (1)" in the header - @javascript @wip + @javascript Scenario: accepting a contact request When I am on the home page And I follow "Manage (1)" diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index fe575c32a..9086b8d5e 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -27,6 +27,5 @@ When /^I wait for the aspects page to load$/ do end When /^I wait for the ajax to finish$/ do - pending - # wait_until { ??? } + wait_until { evaluate_script("$.active") == 0 } end From c3f65d45a1743b15165a10c0e9391d29358b4643 Mon Sep 17 00:00:00 2001 From: zhitomirskiyi Date: Wed, 17 Nov 2010 21:35:13 -0800 Subject: [PATCH 4/4] added nginx logging --- chef/cookbooks/common/recipes/splunk.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chef/cookbooks/common/recipes/splunk.rb b/chef/cookbooks/common/recipes/splunk.rb index 85a29b454..097d5e0bd 100644 --- a/chef/cookbooks/common/recipes/splunk.rb +++ b/chef/cookbooks/common/recipes/splunk.rb @@ -30,6 +30,11 @@ execute "Add monitor for diaspora" do not_if "splunk list monitor | grep diaspora" end +execute "Add monitor for nginx" do + command "splunk add monitor /usr/local/nginx/logs" + not_if "splunk list monitor | grep nginx" +end + execute 'Splunk Restart' do command "splunk restart" end