From 8558570c63587f7ba26836bb8a1bf78b9b7a7cc5 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 20 Jun 2011 12:46:59 -0700 Subject: Move GM file from login/conf/ to login/save/ --- login/conf/.gitignore | 1 - login/conf/gm_account.txt.example | 1 - login/conf/login_athena.conf | 2 +- login/save/.gitignore | 1 + login/save/gm_account.txt.example | 1 + move-stuff.sh | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 login/conf/gm_account.txt.example create mode 100644 login/save/gm_account.txt.example 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/gm_account.txt.example b/login/conf/gm_account.txt.example deleted file mode 100644 index 912e1a09..00000000 --- a/login/conf/gm_account.txt.example +++ /dev/null @@ -1 +0,0 @@ -// 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/save/gm_account.txt.example b/login/save/gm_account.txt.example new file mode 100644 index 00000000..912e1a09 --- /dev/null +++ b/login/save/gm_account.txt.example @@ -0,0 +1 @@ +// 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/ -- cgit v1.2.3-60-g2f50