From a019ce410769a423cada8d7486df258e33a192b9 Mon Sep 17 00:00:00 2001 From: dpedu Date: Thu, 18 Jun 2015 22:22:44 -0700 Subject: [PATCH] Change example config to so simpleyaml isn't required --- examples/config.json | 16 +++++++++++++++ examples/config.yml | 11 ----------- examples/data/config/Services.json | 31 ++++++++++++++++++++++++++++++ examples/data/config/Services.yml | 23 ---------------------- examples/run-example.sh | 2 +- 5 files changed, 48 insertions(+), 35 deletions(-) create mode 100644 examples/config.json delete mode 100644 examples/config.yml create mode 100644 examples/data/config/Services.json delete mode 100644 examples/data/config/Services.yml diff --git a/examples/config.json b/examples/config.json new file mode 100644 index 0000000..8041429 --- /dev/null +++ b/examples/config.json @@ -0,0 +1,16 @@ +{ + "bot":{ + "datadir":"./data/", + "rpcbind":"0.0.0.0", + "rpcport":1876 + }, + "connection":{ + "server":"irc.freenode.net", + "ipv6":"off", + "port":6667 + }, + "modules":[ + "PingResponder", + "Services" + ] +} \ No newline at end of file diff --git a/examples/config.yml b/examples/config.yml deleted file mode 100644 index 58bccc8..0000000 --- a/examples/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -bot: - datadir: ./data/ - rpcbind: 0.0.0.0 - rpcport: 1876 -connection: - server: irc.freenode.net - ipv6: off - port: 6667 -modules: - - PingResponder - - Services diff --git a/examples/data/config/Services.json b/examples/data/config/Services.json new file mode 100644 index 0000000..425655a --- /dev/null +++ b/examples/data/config/Services.json @@ -0,0 +1,31 @@ +{ + "user":{ + "nick":[ + "pyircbot3", + "pyircbot3_", + "pyircbot3__" + ], + "password":"nickservpassword", + "username":"pyircbot3", + "hostname":"pyircbot3.domain.com", + "realname":"pyircbot3" + }, + "ident":{ + "enable":"no", + "to":"nickserv", + "command":"identify %(password)s", + "ghost":"no", + "ghost_to":"nickserv", + "ghost_cmd":"ghost %(nick)s %(password)s" + }, + "channels":[ + "#xmopx" + ], + "privatechannels":{ + "to":"chanserv", + "command":"invite %(channel)s", + "list":[ + "#aprivatechannel" + ] + } +} \ No newline at end of file diff --git a/examples/data/config/Services.yml b/examples/data/config/Services.yml deleted file mode 100644 index b745a68..0000000 --- a/examples/data/config/Services.yml +++ /dev/null @@ -1,23 +0,0 @@ -user: - nick: - - pyircbot3 - - pyircbot3_ - - pyircbot3__ - password: nickservpassword - username: pyircbot3 - hostname: pyircbot3.domain.com - realname: pyircbot3 -ident: - enable: no - to: nickserv - command: identify %(password)s - ghost: yes - ghost_to: nickserv - ghost_cmd: ghost %(nick)s %(password)s -channels: - - "#xmopx" -privatechannels: - to: chanserv - command: invite %(channel)s - list: - - "#aprivatechannel" \ No newline at end of file diff --git a/examples/run-example.sh b/examples/run-example.sh index 69fdefd..b3298af 100755 --- a/examples/run-example.sh +++ b/examples/run-example.sh @@ -1,2 +1,2 @@ #!/bin/sh -pyircbot --config config.yml +pyircbot --config config.json