From 69e619bfa069cf9f535b52c25864b15370384124 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Sun, 17 Aug 2014 01:58:24 -0400 Subject: [PATCH] Renamed files for less confusion --- other/bootstrap_daemon/Makefile.inc | 4 ++-- other/bootstrap_daemon/README.md | 8 ++++---- .../{tox-bootstrapd.sh => tox-bootstrapd} | 0 other/bootstrap_daemon/tox-bootstrapd.c | 4 ++-- other/bootstrap_daemon/{conf => tox-bootstrapd.conf} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename other/bootstrap_daemon/{tox-bootstrapd.sh => tox-bootstrapd} (100%) rename other/bootstrap_daemon/{conf => tox-bootstrapd.conf} (100%) diff --git a/other/bootstrap_daemon/Makefile.inc b/other/bootstrap_daemon/Makefile.inc index f3d9c04e..761bb5cf 100644 --- a/other/bootstrap_daemon/Makefile.inc +++ b/other/bootstrap_daemon/Makefile.inc @@ -22,6 +22,6 @@ tox_bootstrapd_LDADD = \ endif EXTRA_DIST += \ - $(top_srcdir)/other/bootstrap_daemon/conf \ - $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh + $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \ + $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd diff --git a/other/bootstrap_daemon/README.md b/other/bootstrap_daemon/README.md index ec1653d2..fca4738e 100644 --- a/other/bootstrap_daemon/README.md +++ b/other/bootstrap_daemon/README.md @@ -17,13 +17,13 @@ sudo chown tox-bootstrapd:tox-bootstrapd /var/lib/tox-bootstrapd/ sudo chmod 700 /var/lib/tox-bootstrapd/ ``` -Look at the variable declarations in the beginning of `tox-bootstrapd.sh` init script to see if you need to change anything for it to work for you. The default values must be fine for most users and we assume that you use those next. +Look at the variable declarations in the beginning of `tox-bootstrapd` init script to see if you need to change anything for it to work for you. The default values must be fine for most users and we assume that you use those next. -Go over everything in `conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh`. +Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd`. -Place `conf` file to where `CFGFILE` variable from `tox-bootstrapd` tells. By default it's `/etc/tox-bootstrapd.conf`. +Place `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd` tells. By default it's `/etc/tox-bootstrapd.conf`. -Place `tox-bootstrapd.sh` init file at `/etc/init.d/tox-bootstrapd`. +Place `tox-bootstrapd` init file at `/etc/init.d/tox-bootstrapd`. Set permissions for the init system to run the script: ```sh diff --git a/other/bootstrap_daemon/tox-bootstrapd.sh b/other/bootstrap_daemon/tox-bootstrapd similarity index 100% rename from other/bootstrap_daemon/tox-bootstrapd.sh rename to other/bootstrap_daemon/tox-bootstrapd diff --git a/other/bootstrap_daemon/tox-bootstrapd.c b/other/bootstrap_daemon/tox-bootstrapd.c index 0e17b94b..8cec44f3 100644 --- a/other/bootstrap_daemon/tox-bootstrapd.c +++ b/other/bootstrap_daemon/tox-bootstrapd.c @@ -58,8 +58,8 @@ #define SLEEP_TIME_MILLISECONDS 30 #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS) -#define DEFAULT_PID_FILE_PATH ".tox-bootstrapd.pid" -#define DEFAULT_KEYS_FILE_PATH ".tox-bootstrapd.keys" +#define DEFAULT_PID_FILE_PATH "tox-bootstrapd.pid" +#define DEFAULT_KEYS_FILE_PATH "tox-bootstrapd.keys" #define DEFAULT_PORT 33445 #define DEFAULT_ENABLE_IPV6 0 // 1 - true, 0 - false #define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false diff --git a/other/bootstrap_daemon/conf b/other/bootstrap_daemon/tox-bootstrapd.conf similarity index 100% rename from other/bootstrap_daemon/conf rename to other/bootstrap_daemon/tox-bootstrapd.conf