release portal3 into production

diff --git a/app/app.sml b/app/app.sml
index f1a2c14..d59a627 100644 (file)
--- a/app/app.sml
+++ b/app/app.sml
@@ -1,7 +1,7 @@
 structure App :> APP =
 struct
 
-val baseUrl = "https://join3.hcoop.net/join/"
+val baseUrl = "https://join.hcoop.net/join/"
 val portalUrl = Config.urlPrefix
 
 open Sql

diff --git a/config.sml b/config.sml
index 42eac5f..2af252f 100644 (file)
--- a/config.sml
+++ b/config.sml
@@ -1,11 +1,11 @@
 structure Config :> CONFIG = struct
 
 val scratchDir = "/afs/hcoop.net/user/h/hc/hcoop"
-val urlPrefix = "https://members3.hcoop.net/portal/"
+val urlPrefix = "https://members.hcoop.net/portal/"
 val emailSuffix = "@hcoop.net"
 val boardEmail = "board" ^ emailSuffix
 
-val dbstring = "dbname='hcoop_portal3test' user='hcoop' host='postgres' port=5433"
+val dbstring = "dbname='hcoop_portal3' user='hcoop' host='postgres' port=5433"
 
 val kerberosSuffix = "@HCOOP.NET"
                     

diff --git a/portal.mlt b/portal.mlt
index 3d19c19..f7f303d 100644 (file)
--- a/portal.mlt
+++ b/portal.mlt
@@ -4,16 +4,16 @@ val deposit = Balance.depositAmount (#id bal);
 val showBal = Util.sub (#amount bal, deposit);
 @header [] %>
 
-<div style="border: 1px solid goldenrod; background-color: palegoldenrod;">
+<div class="news">
 
-<h3>Notice: Google Checkout Is Gone</h3>
+<h3>Welcome to the Portal On Navajos</h3>
 
-<p>Google Checkout shut down in November 2013 so we only have Paypal
-available for processing payments currently. We are in the process of
-selecting a second (and possibly third) payment processor; you can
-contribute to the discussion by <a
-href="http://wiki.hcoop.net/PaymentProcessor2014">visiting the wiki
-discussion</a>.
+<p><a href="https://wiki.hcoop.net/Hardware#deleuze">Deleuze</a>
+suffered a hardware failure, and the benefit is that the portal is now
+running on our Debian Wheezy web server. List preferences are
+temporarily non-functional, email <a
+href="mailto:admins@hcoop.net"><tt>admins@hcoop.net</tt></a> if you
+would like to change your hcoop list subscriptions.</p>
 
 </div>
 

diff --git a/static/gen.sml b/static/gen.sml
index 6fc65b2..4af0610 100644 (file)
--- a/static/gen.sml
+++ b/static/gen.sml
@@ -10,7 +10,7 @@ end
 
 structure NM = BinaryMapFn(IntKey)
 
-val outputDir = "/home/hcoop/public_html/"
+val outputDir = "/afs/hcoop.net/user/h/hc/hcoop/public_html/"
 
 fun generate () =
     let

diff --git a/stripe/hcoopstripe.py b/stripe/hcoopstripe.py
index 49a4c91..b0ac66f 100644 (file)
--- a/stripe/hcoopstripe.py
+++ b/stripe/hcoopstripe.py
@@ -98,7 +98,7 @@ def stripe_success (redirect_to):
     print ''
     print '<a href="{0}">Go back to the portal</a>'.format(redirect_to)
 
-connstring = 'dbname=hcoop_portal3test user=hcoop host=postgres port=5433'
+connstring = 'dbname=hcoop_portal3 user=hcoop host=postgres port=5433'
 
 def hcoop_stripe_init ():
     cgitb.enable()

diff --git a/stripe/stripe-payment.cgi b/stripe/stripe-payment.cgi
index 67fa904..03de3e4 100755 (executable)
--- a/stripe/stripe-payment.cgi
+++ b/stripe/stripe-payment.cgi
@@ -34,7 +34,7 @@ if request_command == 'member_payment':
 #        assert charge.card.address_zip_check == 'pass', 'Zipcode verification failed or unknown.'
 
         balance = stripe.BalanceTransaction.retrieve (charge.balance_transaction)
-        conn =  psycopg2.connect ('dbname=hcoop_portal3test user=hcoop host=postgres port=5433')
+        conn =  psycopg2.connect ('dbname=hcoop_portal3 user=hcoop host=postgres port=5433')
         cur = conn.cursor ()
         cur.execute ('insert into stripe_payment (charge_id, card_name, webuser_id, paid_on, gross, fee) values (%s, %s, %s, %s, %s, %s)', 
                      (charge.id, charge.card.name, webuser_id, datetime.date.today (), charge.amount, balance.fee))