summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-06-20 12:46:59 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-06-20 12:49:53 -0700
commit8558570c63587f7ba26836bb8a1bf78b9b7a7cc5 (patch)
treec39b8464c43a9dd5e644762dee0fab37f06e614d
parent6ff291ae5ea9db11c0a24d4a15c235146c22d2c2 (diff)
downloadserverdata-8558570c63587f7ba26836bb8a1bf78b9b7a7cc5.tar.gz
serverdata-8558570c63587f7ba26836bb8a1bf78b9b7a7cc5.tar.bz2
serverdata-8558570c63587f7ba26836bb8a1bf78b9b7a7cc5.tar.xz
serverdata-8558570c63587f7ba26836bb8a1bf78b9b7a7cc5.zip
Move GM file from login/conf/ to login/save/
-rw-r--r--login/conf/.gitignore1
-rw-r--r--login/conf/login_athena.conf2
-rw-r--r--login/save/.gitignore1
-rw-r--r--login/save/gm_account.txt.example (renamed from login/conf/gm_account.txt.example)0
-rwxr-xr-xmove-stuff.sh2
5 files changed, 3 insertions, 3 deletions
diff --git a/login/conf/.gitignore b/login/conf/.gitignore
index dcabf83f..2c43e911 100644
--- a/login/conf/.gitignore
+++ b/login/conf/.gitignore
@@ -1,2 +1 @@
/*_local.conf
-/gm_account.txt
diff --git a/login/conf/login_athena.conf b/login/conf/login_athena.conf
index 7d0026d8..6f393c92 100644
--- a/login/conf/login_athena.conf
+++ b/login/conf/login_athena.conf
@@ -17,7 +17,7 @@ new_account: 1
account_filename: save/account.txt
// What account AIDs have GM privs, and what level?
-gm_account_filename: conf/gm_account.txt
+gm_account_filename: save/gm_account.txt
// Timer to check if GM_account file has been changed and reload GM account automaticaly
// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
diff --git a/login/save/.gitignore b/login/save/.gitignore
index 7e1b0055..253bca5b 100644
--- a/login/save/.gitignore
+++ b/login/save/.gitignore
@@ -1 +1,2 @@
/account.txt
+/gm_account.txt
diff --git a/login/conf/gm_account.txt.example b/login/save/gm_account.txt.example
index 912e1a09..912e1a09 100644
--- a/login/conf/gm_account.txt.example
+++ b/login/save/gm_account.txt.example
diff --git a/move-stuff.sh b/move-stuff.sh
index 2dcdc7cb..f7e72e32 100755
--- a/move-stuff.sh
+++ b/move-stuff.sh
@@ -19,7 +19,7 @@ rm conf/eathena-monitor.conf
mv conf/login_local.conf login/conf/
mv conf/ladmin_local.conf login/conf/
-mv conf/gm_account.txt login/conf/
+mv conf/gm_account.txt login/save/
mv conf/char_local.conf world/conf/