summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam <adam@sigterm.info>2015-12-14 17:55:19 -0600
committerAdam <adam@sigterm.info>2015-12-14 17:55:19 -0600
commit0526afa9e06236885195f50529541cf26725a3be (patch)
tree2782bd7af23757b3abc31cbc79f823fe4e8d3119 /src
parenta2d95263789b2c4830e96e4abe3e82ee31aea050 (diff)
parentfc32ae6b425e845c2b7dc43b2c618d6dfb947cf1 (diff)
Merge pull request #138 from SaberUK/master+always-anope
Use "anope" everywhere instead of "services".
Diffstat (limited to 'src')
-rw-r--r--src/config.cpp2
-rw-r--r--src/init.cpp2
-rw-r--r--src/tools/anoperc.in4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/config.cpp b/src/config.cpp
index 2fe8dd74f..5042f1a47 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -24,7 +24,7 @@
using namespace Configuration;
-File ServicesConf("services.conf", false); // Services configuration file name
+File ServicesConf("anope.conf", false); // Services configuration file name
Conf *Config = NULL;
Block::Block(const Anope::string &n) : name(n), linenum(-1)
diff --git a/src/init.cpp b/src/init.cpp
index 124181d2b..e64bf0eff 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -493,7 +493,7 @@ void Anope::Init(int ac, char **av)
catch (const ConfigException &ex)
{
Log(LOG_TERMINAL) << ex.GetReason();
- Log(LOG_TERMINAL) << "*** Support resources: Read through the services.conf self-contained";
+ Log(LOG_TERMINAL) << "*** Support resources: Read through the anope.conf self-contained";
Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
Log(LOG_TERMINAL) << "*** folder. Visit our portal located at http://www.anope.org/. Join";
Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";
diff --git a/src/tools/anoperc.in b/src/tools/anoperc.in
index 5f4e6c5eb..6a7102083 100644
--- a/src/tools/anoperc.in
+++ b/src/tools/anoperc.in
@@ -14,8 +14,8 @@
-ANOPEPID="@INSTDIR@/data/services.pid"
-ANOPROG="@INSTDIR@/bin/services"
+ANOPEPID="@INSTDIR@/data/anope.pid"
+ANOPROG="@INSTDIR@/bin/anope"
LOG="@INSTDIR@/data/logs/"
ARCVERSION="2"