Home Explore Help
Sign In
n4u
/
game_svg_erl_demo
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

kakaranet certificates

SRV1 10 years ago
parent
f4be447a4b
commit
c62d963943
4 changed files with 12 additions and 16 deletions
Unified View Show Diff Stats
  1. 1 1
      apps/web/priv/static/app/index.htm
  2. 2 2
      apps/web/priv/static/app/js/selector.js
  3. 9 12
      apps/web/src/web_sup.erl
  4. 0 1
      rels/web/files/sys.config

+ 1 - 1
apps/web/priv/static/app/index.htm
View File 

@@ -6,7 +6,7 @@
 
     <meta name="viewport" content="initial-scale=1, user-scalable=no">
 
     <meta name="viewport" content="initial-scale=1, user-scalable=no">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <title>Kakaranet Okey</title>
 
     <title>Kakaranet Okey</title>
 
-    <link href='http://fonts.googleapis.com/css?family=Exo+2:600' rel='stylesheet' type='text/css'>
 
+    <link href='https://fonts.googleapis.com/css?family=Exo+2:600' rel='stylesheet' type='text/css'>
 
     <link href="css/main.css" rel="stylesheet" type="text/css" />
 
     <link href="css/main.css" rel="stylesheet" type="text/css" />
 
 </head>
 
 </head>
 
 <body>
 
 <body>

+ 2 - 2
apps/web/priv/static/app/js/selector.js
View File 

@@ -3,8 +3,8 @@ window.perfCounter.start = nowOffset = Date.now();
 
 initialized = false;
 
 initialized = false;
 
 
 
 var scope = {
 
 var scope = {
 
-    apiUrl: "ws://" + window.location.hostname + ":" + window.location.port + "/ws/",
 
-//    apiUrl: "ws://srv5.kakaranet.com:8080/ws/",
 
+    apiUrl: window.location.hostname == "kakaranet.com" ? "wss://kakaranet.com:8443/ws/" :
 
+           "ws://" + window.location.hostname + ":" + window.location.port + "/ws/",
 
     gameId: 1000001,
 
     gameId: 1000001,
 
     CARD_SOURCE: "svg/Card.svg",
 
     CARD_SOURCE: "svg/Card.svg",
 
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",
 
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",

+ 9 - 12
apps/web/src/web_sup.erl
View File 

@@ -8,25 +8,22 @@
 
 
 
 start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 
 
--define(USERS, [#user{id="maxim",email="maxim@synrc.com"},
 
-                #user{id="doxtop",email="doxtop@synrc.com"},
 
-                #user{id="roman",email="roman@github.com"}]).
 
-
 
 init([]) ->
 
 init([]) ->
 
 
 
     {ok, _} = cowboy:start_http(http, 100, [{port, wf:config(n2o,transition_port,8080)}],
 
     {ok, _} = cowboy:start_http(http, 100, [{port, wf:config(n2o,transition_port,8080)}],
 
                                            [{env, [{dispatch, dispatch_rules()}]}]),
 
                                            [{env, [{dispatch, dispatch_rules()}]}]),
 
 
 
-    PrivDir = code:priv_dir(?APP),
 
-
 
-    {ok, _} = cowboy:start_https(https, 100, [
 
+    case file:read_file("/home/kakauser/cert/2014/startssl.ca") of
 
+      {error,_} -> skip;
 
+      {ok,_} ->
 
+        {ok, _} = cowboy:start_https(https, 100, [
 
         {port, wf:config(n2o,port,8443)},
 
         {port, wf:config(n2o,port,8443)},
 
-        {cacertfile, PrivDir ++ "/ssl/cowboy-ca.crt"},
 
-        {certfile, PrivDir ++ "/ssl/server.crt"},
 
-        {keyfile, PrivDir ++ "/ssl/server.key"} ], [{env, [{dispatch, dispatch_rules()}]}]),
 
+        {cacertfile, "/home/kakauser/cert/2014/startssl.ca"},
 
+        {certfile, "/home/kakauser/cert/2014/kakaranet.com.crt"},
 
+        {keyfile, "/home/kakauser/cert/2014/kakaranet.dec.key"} ],
 
+             [{env, [{dispatch, dispatch_rules()}]}])
 
+     end,
 
 
 
-%    users:init(),
 
-%    users:populate(?USERS),
 
 
 
     {ok, {{one_for_one, 5, 10}, []}}.
 
     {ok, {{one_for_one, 5, 10}, []}}.

+ 0 - 1
rels/web/files/sys.config
View File 

@@ -3,7 +3,6 @@
 
  {nsx_idgen, [{game_pool,5000000}]},
 
  {nsx_idgen, [{game_pool,5000000}]},
 
  {n2o, [{route,routes},
 
  {n2o, [{route,routes},
 
         {port,8443},
 
         {port,8443},
 
-        {transition_port,8080},
 
         {log_modules,logallow},
 
         {log_modules,logallow},
 
         {session,js_session},
 
         {session,js_session},
 
         {pickler,n2o_secret}]},
 
         {pickler,n2o_secret}]},