:)

3 files changed, 23 insertions, 62 deletions

diff --git a/config/config.exs b/config/config.exs
index 8933545..c16b3d5 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -9,6 +9,10 @@ use Mix.Config
 config :lsg,
   namespace: LSG
 
+config :lsg, :data_path, "priv"
+
+config :lsg, :icecast_poll_interval, 600_000
+
 # Configures the endpoint
 config :lsg, LSGWeb.Endpoint,
   url: [host: "localhost"],
@@ -27,21 +31,29 @@ config :mime, :types, %{"text/event-stream" => ["sse"]}
 
 config :lsg, :irc,
   handlers: [
+    LSG.IRC.BaseHandler,
+    LSG.IRC.AdminHandler,
     LSG.IRC.BroadcastHandler,
     LSG.IRC.NpHandler,
     LSG.IRC.TxtHandler,
+    LSG.IRC.KickRouletteHandler,
     LSG.IRC.LastFmHandler,
     LSG.IRC.YouTubeHandler,
     LSG.IRC.DiceHandler,
-  ],
-  admins: [
-    # Format is {nick, user, host}. :_ for any value.
+    LSG.IRC.CalcHandler,
   ]
-
-config :lsg, LSG.IRC.TxtHandler, directory: "priv/irc.txt/"
+  #admins: [
+  #  # Format is {nick, user, host}. :_ for any value.
+  #]
+  #irc: [
+  #  host: "irc.",
+  #  port: 6667,
+  #  nick: "`115ans",
+  #  user: "115ans",
+  #  name: "https://sys.115ans.net/irc"
+  #]
 
 config :lsg, LSG.IRC.LastFmHandler,
-  dets_path: 'priv/lastfm.dets',
   api_key: "x",
   api_secret: "x"
 
@@ -51,4 +63,3 @@ config :lsg, LSG.IRC.YouTubeHandler,
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env}.exs"
-import_config "secret.exs"
diff --git a/config/dev.exs b/config/dev.exs
index 346dc12..57ab926 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -46,3 +46,7 @@ config :logger, :console, format: "[$level] $message\n"
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.
 config :phoenix, :stacktrace_depth, 20
+
+import_config "secret.exs"
+import_config "dev.secret.exs"
+
diff --git a/config/prod.exs b/config/prod.exs
index 3db7afd..4e00b42 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -1,63 +1,9 @@
 use Mix.Config
 
-# For production, we often load configuration from external
-# sources, such as your system environment. For this reason,
-# you won't find the :http configuration below, but set inside
-# LSGWeb.Endpoint.init/2 when load_from_system_env is
-# true. Any dynamic configuration should be done there.
-#
-# Don't forget to configure the url host to something meaningful,
-# Phoenix uses this information when generating URLs.
-#
-# Finally, we also include the path to a cache manifest
-# containing the digested version of static files. This
-# manifest is generated by the mix phx.digest task
-# which you typically run after static files are built.
 config :lsg, LSGWeb.Endpoint,
-  url: [host: "lsg.goulag.org", port: 443],
   http: [ip: {0,0,0,0}, port: 4000]
 
-# Do not print debug messages in production
 config :logger, level: :debug
 
-# ## SSL Support
-#
-# To get SSL working, you will need to add the `https` key
-# to the previous section and set your `:url` port to 443:
-#
-#     config :lsg, LSGWeb.Endpoint,
-#       ...
-#       url: [host: "example.com", port: 443],
-#       https: [:inet6,
-#               port: 443,
-#               keyfile: System.get_env("SOME_APP_SSL_KEY_PATH"),
-#               certfile: System.get_env("SOME_APP_SSL_CERT_PATH")]
-#
-# Where those two env variables return an absolute path to
-# the key and cert in disk or a relative path inside priv,
-# for example "priv/ssl/server.key".
-#
-# We also recommend setting `force_ssl`, ensuring no data is
-# ever sent via http, always redirecting to https:
-#
-#     config :lsg, LSGWeb.Endpoint,
-#       force_ssl: [hsts: true]
-#
-# Check `Plug.SSL` for all available options in `force_ssl`.
-
-# ## Using releases
-#
-# If you are doing OTP releases, you need to instruct Phoenix
-# to start the server for all endpoints:
-#
-#     config :phoenix, :serve_endpoints, true
-#
-# Alternatively, you can configure exactly which server to
-# start per endpoint:
-#
-#     config :lsg, LSGWeb.Endpoint, server: true
-#
-
-# Finally import the config/prod.secret.exs
-# which should be versioned separately.
+import_config "secret.exs"
 import_config "prod.secret.exs"