Avoid file/dir names listed in .gitignore

support/dev/README.md

@@ -222,10 +222,10 @@ so they will need to be started manually.
 
 The created *factomd* network is using 3 *factomd* instances that are set up as
 peers in a custom *factomd* network. The configuration files for all the
-instances are located in the `factomd` directory. Note that each of the
+instances are located in the `factom` directory. Note that each of the
 instances has a different identity set up in the config file, so that all nodes
 can be used as leaders in the network (see `IdentityChainID`,
-`LocalServerPrivKey`, `LocalServerPublicKey` in `factomd/factomd_*.conf`).
+`LocalServerPrivKey`, `LocalServerPublicKey` in `factom/factomd_*.conf`).
 
 All the nodes are set up to log to the provided *Logstash* instances by adding
 the command line parameters: `-logstash -logurl=logstash:8345` (see the

support/dev/docker-compose.yml

@@ -13,7 +13,7 @@ services:
         ports:
             - "8090:8090"
         volumes:
-            - ./factomd/factomd_1.conf:/root/.factom/m2/factomd.conf
+            - ./factom/factomd_1.conf:/root/.factom/m2/factomd.conf
         command: -sim_stdin=false -customnet=net -network=CUSTOM -startdelay=10 -logstash -logurl=logstash:8345
         networks:
             factomd:
@@ -31,7 +31,7 @@ services:
         ports:
             - "8190:8090"
         volumes:
-            - ./factomd/factomd_2.conf:/root/.factom/m2/factomd.conf
+            - ./factom/factomd_2.conf:/root/.factom/m2/factomd.conf
         command: -sim_stdin=false -customnet=net -network=CUSTOM -startdelay=10 -logstash -logurl=logstash:8345
         networks:
             factomd:
@@ -49,7 +49,7 @@ services:
         ports:
             - "8290:8090"
         volumes:
-            - ./factomd/factomd_3.conf:/root/.factom/m2/factomd.conf
+            - ./factom/factomd_3.conf:/root/.factom/m2/factomd.conf
         command: -sim_stdin=false -customnet=net -network=CUSTOM -startdelay=10 -logstash -logurl=logstash:8345
         networks:
             factomd:

support/dev/factom/factomd_1.conf

@@ -0,0 +1,90 @@
+; ------------------------------------------------------------------------------
+; App settings
+; ------------------------------------------------------------------------------
+[app]
+;PortNumber                            = 8088
+;HomeDir                               = ""
+; --------------- ControlPanel disabled | readonly | readwrite
+ControlPanelSetting                   = readonly
+ControlPanelPort                      = 8090
+; --------------- DBType: LDB | Bolt | Map
+;DBType                                = "LDB"
+;LdbPath                               = "database/ldb"
+;BoltDBPath                            = "database/bolt"
+;DataStorePath                         = "data/export"
+DirectoryBlockInSeconds               = 60
+;ExportData                            = false
+;ExportDataSubpath                     = "database/export/"
+;FastBoot                              = true
+;FastBootLocation                      = ""
+; --------------- Network: MAIN | TEST | LOCAL
+;Network                               = MAIN
+;PeersFile            = "peers.json"
+;MainNetworkPort      = 8108
+;MainSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/mainseed.txt"
+;MainSpecialPeers     = ""
+;TestNetworkPort      = 8109
+;TestSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/testseed.txt"
+;TestSpecialPeers     = ""
+;LocalNetworkPort     = 8110
+LocalSeedURL         = "http://nginx/peers"
+;LocalSpecialPeers    = ""
+; --------------- NodeMode: FULL | SERVER ----------------
+;NodeMode                                = FULL
+IdentityChainID                          = 38bab1455b7bd7e5efd15c53c777c79d0c988e9210f1da49a99d95b3a6417be9
+LocalServerPrivKey                       = 4c38c72fc5cdad68f13b74674d3ffb1f3d63a112710868c9b08946553448d26d
+LocalServerPublicKey                     = cc1985cdfae4e32b5a454dfda8ce5e1361558482684f3367649c3ad852c8e31a
+;ExchangeRateChainId                     = 111111118d918a8be684e0dac725493a75862ef96d2d3f43f84b26969329bf03
+;ExchangeRateAuthorityPublicKeyMainNet   = daf5815c2de603dbfa3e1e64f88a5cf06083307cf40da4a9b539c41832135b4a
+;ExchangeRateAuthorityPublicKeyTestNet   = 1d75de249c2fc0384fb6701b30dc86b39dc72e5a47ba4f79ef250d39e21e7a4f
+; Private key all zeroes:
+;ExchangeRateAuthorityPublicKeyLocalNet  = 3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29
+
+; These define if the RPC and Control Panel connection to factomd should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli and factom-walletd uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;FactomdTlsEnabled                     = false
+;FactomdTlsPrivateKey                  = "/full/path/to/factomdAPIpriv.key"
+;FactomdTlsPublicCert                  = "/full/path/to/factomdAPIpub.cert"
+
+; These are the username and password that factomd requires for the RPC API and the Control Panel
+; This file is also used by factom-cli and factom-walletd to determine what login to use
+;FactomdRpcUser                        = ""
+;FactomdRpcPass                        = ""
+
+; Specifying when to change ACKs for switching leader servers
+;ChangeAcksHeight                      = 0
+
+; ------------------------------------------------------------------------------
+; logLevel - allowed values are: debug, info, notice, warning, error, critical, alert, emergency and none
+; ConsoleLogLevel - allowed values are: debug, standard
+; ------------------------------------------------------------------------------
+[log]
+;logLevel                              = error
+;LogPath                               = "database/Log"
+;ConsoleLogLevel                       = standard
+
+; ------------------------------------------------------------------------------
+; Configurations for factom-walletd
+; ------------------------------------------------------------------------------
+[Walletd]
+; These are the username and password that factom-walletd requires
+; This file is also used by factom-cli to determine what login to use
+;WalletRpcUser                         = ""
+;WalletRpcPass                         = ""
+
+; These define if the connection to the wallet should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;WalletTlsEnabled                      = false
+;WalletTlsPrivateKey                   = "/full/path/to/walletAPIpriv.key"
+;WalletTlsPublicCert                   = "/full/path/to/walletAPIpub.cert"
+
+; This is where factom-walletd and factom-cli will find factomd to interact with the blockchain
+; This value can also be updated to authorize an external ip or domain name when factomd creates a TLS cert
+;FactomdLocation                       = "localhost:8088"
+
+; This is where factom-cli will find factom-walletd to create Factoid and Entry Credit transactions
+; This value can also be updated to authorize an external ip or domain name when factom-walletd creates a TLS cert
+;WalletdLocation                       = "localhost:8089"
+

support/dev/factom/factomd_2.conf

@@ -0,0 +1,90 @@
+; ------------------------------------------------------------------------------
+; App settings
+; ------------------------------------------------------------------------------
+[app]
+;PortNumber                            = 8088
+;HomeDir                               = ""
+; --------------- ControlPanel disabled | readonly | readwrite
+ControlPanelSetting                   = readonly
+ControlPanelPort                      = 8090
+; --------------- DBType: LDB | Bolt | Map
+;DBType                                = "LDB"
+;LdbPath                               = "database/ldb"
+;BoltDBPath                            = "database/bolt"
+;DataStorePath                         = "data/export"
+DirectoryBlockInSeconds               = 60
+;ExportData                            = false
+;ExportDataSubpath                     = "database/export/"
+;FastBoot                              = true
+;FastBootLocation                      = ""
+; --------------- Network: MAIN | TEST | LOCAL
+;Network                               = MAIN
+;PeersFile            = "peers.json"
+;MainNetworkPort      = 8108
+;MainSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/mainseed.txt"
+;MainSpecialPeers     = ""
+;TestNetworkPort      = 8109
+;TestSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/testseed.txt"
+;TestSpecialPeers     = ""
+;LocalNetworkPort     = 8110
+LocalSeedURL         = "http://nginx/peers"
+;LocalSpecialPeers    = ""
+; --------------- NodeMode: FULL | SERVER ----------------
+;NodeMode                                = FULL
+IdentityChainID                          = 888888367795422bb2b15bae1af83396a94efa1cecab8cd171197eabd4b4bf9b
+LocalServerPrivKey                       = 5319e64e156893ed32e0a863b2622821d2d59ce7cf644fdbe93bf5a065af52fc
+LocalServerPublicKey                     = ad6f634018389a29da51586ef69f747bb4608d29e19c40242f1b1c3bd4cede16
+;ExchangeRateChainId                     = 111111118d918a8be684e0dac725493a75862ef96d2d3f43f84b26969329bf03
+;ExchangeRateAuthorityPublicKeyMainNet   = daf5815c2de603dbfa3e1e64f88a5cf06083307cf40da4a9b539c41832135b4a
+;ExchangeRateAuthorityPublicKeyTestNet   = 1d75de249c2fc0384fb6701b30dc86b39dc72e5a47ba4f79ef250d39e21e7a4f
+; Private key all zeroes:
+;ExchangeRateAuthorityPublicKeyLocalNet  = 3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29
+
+; These define if the RPC and Control Panel connection to factomd should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli and factom-walletd uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;FactomdTlsEnabled                     = false
+;FactomdTlsPrivateKey                  = "/full/path/to/factomdAPIpriv.key"
+;FactomdTlsPublicCert                  = "/full/path/to/factomdAPIpub.cert"
+
+; These are the username and password that factomd requires for the RPC API and the Control Panel
+; This file is also used by factom-cli and factom-walletd to determine what login to use
+;FactomdRpcUser                        = ""
+;FactomdRpcPass                        = ""
+
+; Specifying when to change ACKs for switching leader servers
+;ChangeAcksHeight                      = 0
+
+; ------------------------------------------------------------------------------
+; logLevel - allowed values are: debug, info, notice, warning, error, critical, alert, emergency and none
+; ConsoleLogLevel - allowed values are: debug, standard
+; ------------------------------------------------------------------------------
+[log]
+;logLevel                              = error
+;LogPath                               = "database/Log"
+;ConsoleLogLevel                       = standard
+
+; ------------------------------------------------------------------------------
+; Configurations for factom-walletd
+; ------------------------------------------------------------------------------
+[Walletd]
+; These are the username and password that factom-walletd requires
+; This file is also used by factom-cli to determine what login to use
+;WalletRpcUser                         = ""
+;WalletRpcPass                         = ""
+
+; These define if the connection to the wallet should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;WalletTlsEnabled                      = false
+;WalletTlsPrivateKey                   = "/full/path/to/walletAPIpriv.key"
+;WalletTlsPublicCert                   = "/full/path/to/walletAPIpub.cert"
+
+; This is where factom-walletd and factom-cli will find factomd to interact with the blockchain
+; This value can also be updated to authorize an external ip or domain name when factomd creates a TLS cert
+;FactomdLocation                       = "localhost:8088"
+
+; This is where factom-cli will find factom-walletd to create Factoid and Entry Credit transactions
+; This value can also be updated to authorize an external ip or domain name when factom-walletd creates a TLS cert
+;WalletdLocation                       = "localhost:8089"
+

support/dev/factom/factomd_3.conf

@@ -0,0 +1,90 @@
+; ------------------------------------------------------------------------------
+; App settings
+; ------------------------------------------------------------------------------
+[app]
+;PortNumber                            = 8088
+;HomeDir                               = ""
+; --------------- ControlPanel disabled | readonly | readwrite
+ControlPanelSetting                   = readonly
+ControlPanelPort                      = 8090
+; --------------- DBType: LDB | Bolt | Map
+;DBType                                = "LDB"
+;LdbPath                               = "database/ldb"
+;BoltDBPath                            = "database/bolt"
+;DataStorePath                         = "data/export"
+DirectoryBlockInSeconds               = 60
+;ExportData                            = false
+;ExportDataSubpath                     = "database/export/"
+;FastBoot                              = true
+;FastBootLocation                      = ""
+; --------------- Network: MAIN | TEST | LOCAL
+;Network                               = MAIN
+;PeersFile            = "peers.json"
+;MainNetworkPort      = 8108
+;MainSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/mainseed.txt"
+;MainSpecialPeers     = ""
+;TestNetworkPort      = 8109
+;TestSeedURL          = "https://raw.githubusercontent.com/FactomProject/factomproject.github.io/master/seed/testseed.txt"
+;TestSpecialPeers     = ""
+;LocalNetworkPort     = 8110
+LocalSeedURL         = "http://nginx/peers"
+;LocalSpecialPeers    = ""
+; --------------- NodeMode: FULL | SERVER ----------------
+;NodeMode                                = FULL
+IdentityChainID                          = 888888fc37fa418395eeccb95ab0a4c64d528b2aeefa0d1632c8a116a0e4f5b1
+LocalServerPrivKey                       = 9112a3e619262f36cb7e5e704e0875b5eb3c24cd4e0deb06523f37440ddd352c
+LocalServerPublicKey                     = c845f47df202a649e2262d3da0e35556aab62e361425ad7d2e7813a215c8f277
+;ExchangeRateChainId                     = 111111118d918a8be684e0dac725493a75862ef96d2d3f43f84b26969329bf03
+;ExchangeRateAuthorityPublicKeyMainNet   = daf5815c2de603dbfa3e1e64f88a5cf06083307cf40da4a9b539c41832135b4a
+;ExchangeRateAuthorityPublicKeyTestNet   = 1d75de249c2fc0384fb6701b30dc86b39dc72e5a47ba4f79ef250d39e21e7a4f
+; Private key all zeroes:
+;ExchangeRateAuthorityPublicKeyLocalNet  = 3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29
+
+; These define if the RPC and Control Panel connection to factomd should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli and factom-walletd uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;FactomdTlsEnabled                     = false
+;FactomdTlsPrivateKey                  = "/full/path/to/factomdAPIpriv.key"
+;FactomdTlsPublicCert                  = "/full/path/to/factomdAPIpub.cert"
+
+; These are the username and password that factomd requires for the RPC API and the Control Panel
+; This file is also used by factom-cli and factom-walletd to determine what login to use
+;FactomdRpcUser                        = ""
+;FactomdRpcPass                        = ""
+
+; Specifying when to change ACKs for switching leader servers
+;ChangeAcksHeight                      = 0
+
+; ------------------------------------------------------------------------------
+; logLevel - allowed values are: debug, info, notice, warning, error, critical, alert, emergency and none
+; ConsoleLogLevel - allowed values are: debug, standard
+; ------------------------------------------------------------------------------
+[log]
+;logLevel                              = error
+;LogPath                               = "database/Log"
+;ConsoleLogLevel                       = standard
+
+; ------------------------------------------------------------------------------
+; Configurations for factom-walletd
+; ------------------------------------------------------------------------------
+[Walletd]
+; These are the username and password that factom-walletd requires
+; This file is also used by factom-cli to determine what login to use
+;WalletRpcUser                         = ""
+;WalletRpcPass                         = ""
+
+; These define if the connection to the wallet should be encrypted, and if it is, what files
+; are the secret key and the public certificate.  factom-cli uses the certificate specified here if TLS is enabled.
+; To use default files and paths leave /full/path/to/... in place.
+;WalletTlsEnabled                      = false
+;WalletTlsPrivateKey                   = "/full/path/to/walletAPIpriv.key"
+;WalletTlsPublicCert                   = "/full/path/to/walletAPIpub.cert"
+
+; This is where factom-walletd and factom-cli will find factomd to interact with the blockchain
+; This value can also be updated to authorize an external ip or domain name when factomd creates a TLS cert
+;FactomdLocation                       = "localhost:8088"
+
+; This is where factom-cli will find factom-walletd to create Factoid and Entry Credit transactions
+; This value can also be updated to authorize an external ip or domain name when factom-walletd creates a TLS cert
+;WalletdLocation                       = "localhost:8089"
+

support/dev/nginx/html/peers

@@ -0,0 +1,3 @@
+10.7.0.1:8110
+10.7.0.2:8110
+10.7.0.3:8110