diff options
Diffstat (limited to '')
30 files changed, 55 insertions, 53 deletions
diff --git a/sca-cpp/trunk/samples/relay-gae/htdocs/index.html b/sca-cpp/trunk/samples/relay-gae/htdocs/index.html index c3cf8d768e..b8b606d3d9 100644 --- a/sca-cpp/trunk/samples/relay-gae/htdocs/index.html +++ b/sca-cpp/trunk/samples/relay-gae/htdocs/index.html @@ -21,7 +21,7 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Relay</title> </head> <body> diff --git a/sca-cpp/trunk/samples/relay-python/htdocs/index.html b/sca-cpp/trunk/samples/relay-python/htdocs/index.html index 28061397d5..ad5f86aa02 100644 --- a/sca-cpp/trunk/samples/relay-python/htdocs/index.html +++ b/sca-cpp/trunk/samples/relay-python/htdocs/index.html @@ -21,7 +21,7 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Relay</title> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html index 43f624a8c3..832c0a1472 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Jane's Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html index 9fcafbd5a1..2a7be01ff1 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign in</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html index 4140eb3b93..50a10bdd8b 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign out</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html index 34c8dd3986..0caf8b3df1 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Joe's Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html index 9fcafbd5a1..2a7be01ff1 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign in</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html index 4140eb3b93..50a10bdd8b 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html +++ b/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign out</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/index.html index c1bd39181d..50c7e25ee6 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/index.html @@ -21,7 +21,7 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> </head> diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html index 9fcafbd5a1..2a7be01ff1 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign in</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html index 4140eb3b93..50a10bdd8b 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign out</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-cluster/proxy-conf b/sca-cpp/trunk/samples/store-cluster/proxy-conf index 215c25f2f7..c43feff551 100755 --- a/sca-cpp/trunk/samples/store-cluster/proxy-conf +++ b/sca-cpp/trunk/samples/store-cluster/proxy-conf @@ -24,7 +24,7 @@ set -x # Configure a proxy balancer ../../modules/http/httpd-conf $root sca-store.com $port/80 $root/htdocs -../../modules/http/vhost-conf $root $root/domains htdocs +../../modules/http/mass-host-conf $root $root/domains htdocs ../../modules/http/proxy-conf $root ../../modules/http/httpd-event-conf $root diff --git a/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf b/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf index b8d202049b..e4ddbb0c4b 100755 --- a/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf +++ b/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf @@ -25,12 +25,13 @@ set -x # Configure an SSL-enabled proxy balancer ../../modules/http/httpd-conf $root sca-store.com $port $root/htdocs -../../modules/http/vhost-conf $root $root/domains htdocs +../../modules/http/mass-host-conf $root $root/domains htdocs ../../modules/http/proxy-conf $root ../../modules/http/httpd-event-conf $root tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x ../../modules/http/httpd-ssl-conf $root $sslport -../../modules/http/vhost-ssl-conf $root +../../modules/http/httpd-tunnel-ssl-conf $root +../../modules/http/mass-host-ssl-conf $root ../../modules/http/proxy-ssl-conf $root # Aggregate proxy balancer logs diff --git a/sca-cpp/trunk/samples/store-cluster/server-conf b/sca-cpp/trunk/samples/store-cluster/server-conf index 5113bc36f4..089e1842db 100755 --- a/sca-cpp/trunk/samples/store-cluster/server-conf +++ b/sca-cpp/trunk/samples/store-cluster/server-conf @@ -25,7 +25,7 @@ set -x # Configure an app server ../../modules/http/httpd-conf $root sca-store.com $port/80 htdocs ../../modules/http/httpd-event-conf $root -../../modules/http/vhost-conf $root domains htdocs +../../modules/http/mass-host-conf $root domains htdocs ../../modules/server/server-conf $root ../../modules/python/python-conf $root cat >>$root/conf/httpd.conf <<EOF diff --git a/sca-cpp/trunk/samples/store-cluster/server-ssl-conf b/sca-cpp/trunk/samples/store-cluster/server-ssl-conf index a7813b2a01..4180a44056 100755 --- a/sca-cpp/trunk/samples/store-cluster/server-ssl-conf +++ b/sca-cpp/trunk/samples/store-cluster/server-ssl-conf @@ -26,11 +26,12 @@ set -x # Configure an SSL-enabled app server ../../modules/http/httpd-conf $root sca-store.com $port htdocs ../../modules/http/httpd-event-conf $root -../../modules/http/vhost-conf $root domains htdocs +../../modules/http/mass-host-conf $root domains htdocs tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x ../../modules/http/httpd-ssl-conf $root $sslport -../../modules/http/vhost-ssl-conf $root +../../modules/http/httpd-tunnel-ssl-conf $root +../../modules/http/mass-host-ssl-conf $root ../../modules/oauth/oauth-conf $root ../../modules/oauth/oauth-memcached-conf $root localhost 11211 diff --git a/sca-cpp/trunk/samples/store-constdb/htdocs/index.html b/sca-cpp/trunk/samples/store-constdb/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-constdb/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-constdb/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-gae/htdocs/index.html b/sca-cpp/trunk/samples/store-gae/htdocs/index.html index 979d27e048..7c9a9e9d6b 100644 --- a/sca-cpp/trunk/samples/store-gae/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-gae/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-java/htdocs/index.html b/sca-cpp/trunk/samples/store-java/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-java/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-java/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-python/htdocs/index.html b/sca-cpp/trunk/samples/store-python/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-python/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-python/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-python/htdocs/login/index.html b/sca-cpp/trunk/samples/store-python/htdocs/login/index.html index 3936730553..fd3bc21889 100644 --- a/sca-cpp/trunk/samples/store-python/htdocs/login/index.html +++ b/sca-cpp/trunk/samples/store-python/htdocs/login/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign in</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html b/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html index 1108b00e65..92fd2a084b 100644 --- a/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html +++ b/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html @@ -22,8 +22,8 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> -<script type="text/javascript" src="/all.js"></script> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +<script type="text/javascript" src="/all-min.js"></script> <title>Sign out</title> </head> <body> diff --git a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-sql/htdocs/index.html b/sca-cpp/trunk/samples/store-sql/htdocs/index.html index 4a621631bd..0698a32cc5 100644 --- a/sca-cpp/trunk/samples/store-sql/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-sql/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html b/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html index 43f624a8c3..832c0a1472 100644 --- a/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Jane's Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html b/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html index 34c8dd3986..0caf8b3df1 100644 --- a/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html @@ -21,10 +21,10 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Joe's Store</title> -<script type="text/javascript" src="/all.js"></script> +<script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript"> var store = sca.component("Store"); diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/index.html index a24ecd4379..fc377e5b61 100644 --- a/sca-cpp/trunk/samples/store-vhost/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-vhost/htdocs/index.html @@ -21,7 +21,7 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> -<link rel="stylesheet" type="text/css" href="/ui.css"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> <title>Store</title> </head> diff --git a/sca-cpp/trunk/samples/store-vhost/ssl-start b/sca-cpp/trunk/samples/store-vhost/ssl-start index ef6e40f93a..528c0a5e73 100755 --- a/sca-cpp/trunk/samples/store-vhost/ssl-start +++ b/sca-cpp/trunk/samples/store-vhost/ssl-start @@ -25,9 +25,9 @@ ../../modules/http/ssl-cert-conf tmp *.example.com vhost ../../modules/http/httpd-conf tmp example.com 8090 htdocs ../../modules/http/httpd-event-conf tmp -../../modules/http/vhost-conf tmp domains htdocs +../../modules/http/mass-host-conf tmp domains htdocs ../../modules/http/httpd-ssl-conf tmp 8453 -../../modules/http/vhost-ssl-conf tmp +../../modules/http/mass-host-ssl-conf tmp ../../modules/http/basic-auth-conf tmp ../../modules/http/passwd-auth-conf tmp foo foo ../../modules/server/server-conf tmp diff --git a/sca-cpp/trunk/samples/store-vhost/start b/sca-cpp/trunk/samples/store-vhost/start index fef691a058..6a20a60762 100755 --- a/sca-cpp/trunk/samples/store-vhost/start +++ b/sca-cpp/trunk/samples/store-vhost/start @@ -20,7 +20,7 @@ rm -rf tmp ../../modules/http/httpd-conf tmp example.com 8090 htdocs ../../modules/http/httpd-event-conf tmp -../../modules/http/vhost-conf tmp domains htdocs +../../modules/http/mass-host-conf tmp domains htdocs ../../modules/server/server-conf tmp ../../modules/python/python-conf tmp cat >>tmp/conf/httpd.conf <<EOF diff --git a/sca-cpp/trunk/samples/store-vhost/uec2-start b/sca-cpp/trunk/samples/store-vhost/uec2-start index d530d1d2a7..f86ce0f56b 100755 --- a/sca-cpp/trunk/samples/store-vhost/uec2-start +++ b/sca-cpp/trunk/samples/store-vhost/uec2-start @@ -34,9 +34,9 @@ sudo ../../ubuntu/ip-redirect-all 443 8453 ../../modules/http/ssl-cert-conf tmp "*.$host" vhost ../../modules/http/httpd-conf tmp $host 8090/80 htdocs ../../modules/http/httpd-event-conf tmp -../../modules/http/vhost-conf tmp domains htdocs +../../modules/http/mass-host-conf tmp domains htdocs ../../modules/http/httpd-ssl-conf tmp 8453/443 -../../modules/http/vhost-ssl-conf tmp +../../modules/http/mass-host-ssl-conf tmp ../../modules/server/server-conf tmp ../../modules/python/python-conf tmp cat >>tmp/conf/httpd.conf <<EOF |