slant

<VirtualHost *:80>
  ServerName blog.cylenceweb.com
  ServerAlias blog.cylenceweb.com
  DocumentRoot /var/www/web/blog

  <Directory /var/www/web/blog>
    Options FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all

slant

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git status
# On branch ryan-campaigns
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	modified:   .gitignore
#	modified:   app/controllers/application.rb
#	modified:   app/controllers/customers_controller.rb
#	modified:   app/controllers/registrations_controller.rb
#	modified:   app/helpers/customers_helper.rb

slant

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git reset --hard
HEAD is now at 04fca40... Accept CCF

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git pull
Updating 04fca40..2a01c75
fatal: Untracked working tree file 'app/views/customers/_phone_number.rhtml' would be overwritten by merge.

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git status
# On branch ryan-campaigns
# Untracked files:

slant

#
# Based upon the NCSA server configuration files originally by Rob McCool.
#
# This is the main Apache server configuration file.  It contains the
# configuration directives that give the server its instructions.
# See http://httpd.apache.org/docs/2.2/ for detailed information about
# the directives.
#
# Do NOT simply read the instructions in here without understanding
# what they do.  They're here only as hints or reminders.  If you are unsure

slant

NameVirtualHost *:80

<VirtualHost *:80>
	ServerAdmin webmaster@localhost
	DocumentRoot /var/www/web/cylenceweb

	<Directory />
		Options FollowSymLinks
		AllowOverride None
	</Directory>

slant

<VirtualHost *:80>
  ServerName blog.cylenceweb.com
  DocumentRoot /var/www/web/blog

  <Directory "/var/www/web/blog">
    Options FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all
  </Directory>

slant

<VirtualHost *:80>
  ServerName dropbox.cylenceweb.com
  DocumentRoot /opt/dropbox

  <Directory "/opt/dropbox">
    Options Indexes FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all
  </Directory>

slant

<VirtualHost *:80>
  ServerName dropbox.cylenceweb.com
  DocumentRoot /opt/dropbox

  <Directory "/opt/dropbox">
    Options Indexes FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all
  </Directory>

slant

  <%- # Campaign Name: ID Watchdog Exclusive -%>
  <script src="http://affiliates.idwatchdog.com/i_sale_third/3/<%= signup_fee(@customer.cart_product, @customer.campaign) %>/<%= @customer.account_number %>/OPTIONAL_INFORMATION"></script> <noscript><IMG SRC="http://affiliates.idwatchdog.com/i_track_sale/3/LINE_ITEM_STRING/TRANSACTION_ID/OPTIONAL_INFORMATION"></noscript>

  <%= # Campaign Name: ID Watchdog 15-Day %>
  <script src="http://affiliates.idwatchdog.com/i_sale_third/2/<%= signup_fee(@customer.cart_product, @customer.campaign) %>/<%= @customer.account_number %>/OPTIONAL_INFORMATION"></script> <noscript><IMG SRC="http://affiliates.idwatchdog.com/i_track_sale/2/LINE_ITEM_STRING/TRANSACTION_ID/OPTIONAL_INFORMATION"></noscript>

  <%= # Campaign Name: $42 + 5% Off %>
  <script src="http://affiliates.idwatchdog.com/i_sale_third/4/<%= signup_fee(@customer.cart_product, @customer.campaign) %>/<%= @customer.account_number %>/OPTIONAL_INFORMATION"></script> <noscript><IMG SRC="http://affiliates.idwatchdo

slant

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .gitignore
#	modified:   app/controllers/api/customers_controller.rb
#	modified:   app/controllers/application.rb
#	modified:   app/controllers/customers_controller.rb
#	modified:   app/controllers/registrations_controller.rb
#	modified:   app/controllers/sessions_controller.rb