riak ready, just uncomment

samples/otp.mk

@@ -19,7 +19,7 @@ $(RUN_DIR) $(LOG_DIR):
 	mkdir -p $(RUN_DIR) & mkdir -p $(LOG_DIR)
 console: .applist
 	ERL_LIBS=$(ERL_LIBS) erl $(ERL_ARGS) -eval \
-		'[ok = application:ensure_started(A, permanent) || A <- $(shell cat .applist)]'
+		'[application:start(A) || A <- $(shell cat .applist)]'
 start: $(RUN_DIR) $(LOG_DIR) .applist
 	ERL_LIBS=$(ERL_LIBS) run_erl -daemon $(RUN_DIR)/ $(LOG_DIR)/ "exec $(MAKE) console"
 attach:

samples/rebar.config

@@ -4,5 +4,6 @@
 {deps, [
     {active,  ".*", {git, "git://github.com/synrc/active", {tag,"0.9"}}},
     {kai,     ".*", {git, "git://github.com/synrc/kai", "HEAD"}},
+%    {riak_kv, ".*", {git, "git://github.com/riak-synrc/riak_kv", "HEAD"}},
     {kvs,     ".*", {git, "git://github.com/synrc/kvs", "HEAD"}}
 ]}.

samples/rels/files/sys.config

@@ -2,7 +2,7 @@
  {kvs,
      [{pass_init_db,true},
       {nodes,[]},
-      {dba, store_mnesia},
+      {dba, store_riak},
       {schema, [kvs_user, kvs_acl, kvs_feed, kvs_subscription]}]},
  {sasl, [
          {sasl_error_logger, {file, "log/sasl-error.log"}},
@@ -10,6 +10,59 @@
          {error_logger_mf_dir, "log/sasl"},      % Log directory
          {error_logger_mf_maxbytes, 10485760},   % 10 MB max file size
          {error_logger_mf_maxfiles, 5}           % 5 files max
-        ]}
+        ]},
+ {riak_ensemble, [{data_root, "test-tmp"}]},
+ {riak_core,
+     [{ring_state_dir,"riak/ring"},
+      {https,[{"0.0.0.0",8150}]},
+      {handoff_port,8101},
+      {ssl,[
+       {cacertfile,"ssl/ca.crt"},
+       {certfile,"ssl/server.crt"},
+       {keyfile,"ssl/server.key"}]},
+      {platform_bin_dir,"/usr/sbin"},
+      {platform_data_dir,"riak"},
+      {platform_etc_dir,"etc"},
+      {platform_lib_dir,"lib"},
+      {platform_log_dir,"riak/log"}]},
+ {riak_kv,
+     [{storage_backend, riak_kv_multi_backend},
+      {multi_backend_default, bitcask_backend},
+      {multi_backend, [{bitcask_backend, riak_kv_bitcask_backend,[{data_root,"riak/bitcask"}]},
+                       {leveldb_backend, riak_kv_eleveldb_backend,[{data_root,"riak/leveldb"}]}]},
+      {mapred_name,"mapred"},
+      {mapred_system,pipe},
+      {mapred_2i_pipe,true},
+      {map_js_vm_count,0},
+      {reduce_js_vm_count,0},
+      {hook_js_vm_count,0},
+      {js_max_vm_mem,0},
+      {js_thread_stack,0},
+      {http_url_encoding,on},
+      {riak_kv_stat,true},
+      {legacy_stats,true},
+      {vnode_vclocks,true},
+      {legacy_keylisting,false},
+      {listkeys_backpressure,true}]},
+ {riak_search,[{enabled,true}]},
+ {merge_index,
+     [{data_root,"riak/merge_index"},
+      {data_root_2i,"riak/merge_index_2i"},
+      {buffer_rollover_size,1048576},
+      {max_compact_segments,20}]},
+ {bitcask,[{data_root,"riak/bitcask"}]},
+ {eleveldb,[{data_root,"riak/leveldb"}]},
+ {riak_sysmon,
+     [{process_limit,30},
+      {port_limit,2},
+      {gc_ms_limit,100},
+      {heap_word_limit,40111000},
+      {busy_port,true},
+      {busy_dist_port,true}]},
+ {riak_control,
+     [{enabled,true},
+      {auth,userlist},
+      {userlist,[{"user","pass"}]},
+      {admin,true}]}
 ].
 

samples/ssl/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICeDCCAeGgAwIBAgIJAOvpU0y2e5J4MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczETMBEGA1UECgwKTmluZSBOaW5lczEPMA0G
+A1UECwwGQ293Ym95MRAwDgYDVQQDDAdST09UIENBMB4XDTEzMDIyODA1MTAwMVoX
+DTMzMDIyMzA1MTAwMVowVTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRMw
+EQYDVQQKDApOaW5lIE5pbmVzMQ8wDQYDVQQLDAZDb3dib3kxEDAOBgNVBAMMB1JP
+T1QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMzmY7Us06yjyUbpqwPx
+Iv+xh/g3V7we07ClC9GEYnvr3OQvdA1jFEHccMBUUjRoQ8DPd6uSyK5UkixABs08
+Tt5B3VsnGKr0DIN+IO4SN2PkmBqIU/BN3KdcwN65YNr3iM0KsKWeFtAZdYx4CakX
+7REbO0wjK20AH3xSBn3uFGiBAgMBAAGjUDBOMB0GA1UdDgQWBBRKfZ8KF2jlLBDm
+NL6IuEuGY0pdbzAfBgNVHSMEGDAWgBRKfZ8KF2jlLBDmNL6IuEuGY0pdbzAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG1I0kBxXiLkM1b7rl2zPLizREYg
+1m+ajb6rWzPOBg6TXjv58Be+H4tqoHIL/M/crixew5emftBkuAGjiKMhbIokjvan
+aPTCV8U6HHvNvz9c68HpESWbd+56cHqfsS5XCKp1OpW5tbL2UQYpFKMP4qmbv3Ea
+pBfPPmSFMBb1i2AI
+-----END CERTIFICATE-----

samples/ssl/server.crt

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICpTCCAg6gAwIBAgIJAOvpU0y2e5J5MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczETMBEGA1UECgwKTmluZSBOaW5lczEPMA0G
+A1UECwwGQ293Ym95MRAwDgYDVQQDDAdST09UIENBMB4XDTEzMDIyODA1MjMzNFoX
+DTMzMDIyMzA1MjMzNFowVzELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRMw
+EQYDVQQKDApOaW5lIE5pbmVzMQ8wDQYDVQQLDAZDb3dib3kxEjAQBgNVBAMMCWxv
+Y2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzbW1GjECzHUc/WST
+qLiAGqjCNccR5saVS+yoz2SPRhpoyf0/qBrX5BY0tzmgozoTiRfE4wCiVD99Cc+D
+rp/FM49r4EpZdocIovprmOmv/gwkoj95zaA6PKNn1OdmDp2hwJsX2Zm3kpbGUZTx
+jDkkccmgUb4EjL7qNHq7saQtivUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+FB6jTEIWI8T1ckORA4GezbyYxtbvMB8GA1UdIwQYMBaAFEp9nwoXaOUsEOY0voi4
+S4ZjSl1vMA0GCSqGSIb3DQEBBQUAA4GBACMboVQjrx8u/fk3gl/sR0tbA0Wf/NcS
+2Dzsy2czndgVUAG4Sqb+hfgn0dqAyUKghRrj3JDcYxYksGPIklDfPzZb7yJ39l16
+6x5ZiIzhp8CAVdPvRxRznw5rZwaXesryXu1jVSZxTr3MYZdkG6KaAM0t90+YlGLZ
+UG8fAicx0Bf+
+-----END CERTIFICATE-----

samples/ssl/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDNtbUaMQLMdRz9ZJOouIAaqMI1xxHmxpVL7KjPZI9GGmjJ/T+o
+GtfkFjS3OaCjOhOJF8TjAKJUP30Jz4Oun8Uzj2vgSll2hwii+muY6a/+DCSiP3nN
+oDo8o2fU52YOnaHAmxfZmbeSlsZRlPGMOSRxyaBRvgSMvuo0eruxpC2K9QIDAQAB
+AoGAaD85c/h6bpq7Aj7CBbLaWKhFI3OqwsTITB22vsM7SE+B4zsP02UnG1OVi3UM
+zytTUxpUkKV1njQ+bYZYOVqGWF4Up8tTqUglHn0FTPok1AIemELWtz3sXvdSHC1T
+lqvFBAZ9kibn13qGyVOiyCFaMwfOM/05RvV7p3jfUMTWnNECQQDs7yCJZ8Ol8MyH
+TGZzvkjoN2zg1KwmTbSD1hkP6QAJtPdRuqFbjlEru0/PefgOXsWLRIa3/3v0qw2G
+xGkV6AXTAkEA3kNbFisqUydjPnZIYv/P6SvPdUimHJEjXbAbfNfzS9dzszrOVJd2
+XqGH7z5yzjoH3IyaIMW8GnubVzGDSjrHFwJAKSU5vELlygpwKkrNO+pelN0TLlQg
+dSJnZ8GlZorq88SWcn37iX/EftivenNO7YftvEqxLoDSkOGnnrC7Iw/A+wJBAIEe
+L/QY72WPJCBNJpAce/PA96vyoE1II3txqwZDjZspdpVQPDz4IFOpEwbxCFC1dYuy
+Qnd3Z2cbF4r3wIWGz9ECQQCJGNhUNtY+Om1ELdqPcquxE2VRV/pucnvJSTKwyo2C
+Rvm6H7kFDwPDuN23YnTOlTiho0zzCkclcIukhIVJ+dKz
+-----END RSA PRIVATE KEY-----