diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-08-19 12:38:14 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-08-19 12:38:14 -0400 |
| commit | f368b67914578cfb73cb1a8e5a743bb845c138ab (patch) | |
| tree | 35969b82ee1b74bdd015b0c254b697cc3118df90 /other | |
| parent | 92dd71cdba4b6f66227741f28f93c9bc4b29c554 (diff) | |
| parent | 02f90fc6041452d54db3b5f1e6191593d59b6cec (diff) | |
Merge branch 'nurupo-bootstrapd-fix'
Diffstat (limited to 'other')
| -rw-r--r-- | other/bootstrap_daemon/Makefile.inc | 2 | ||||
| -rw-r--r-- | other/bootstrap_daemon/README.md | 6 | ||||
| -rw-r--r-- | other/bootstrap_daemon/tox-bootstrapd.sh (renamed from other/bootstrap_daemon/tox-bootstrapd) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/other/bootstrap_daemon/Makefile.inc b/other/bootstrap_daemon/Makefile.inc index 761bb5cf..f274aba0 100644 --- a/other/bootstrap_daemon/Makefile.inc +++ b/other/bootstrap_daemon/Makefile.inc | |||
| @@ -23,5 +23,5 @@ endif | |||
| 23 | 23 | ||
| 24 | EXTRA_DIST += \ | 24 | EXTRA_DIST += \ |
| 25 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \ | 25 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \ |
| 26 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd | 26 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh |
| 27 | 27 | ||
diff --git a/other/bootstrap_daemon/README.md b/other/bootstrap_daemon/README.md index fca4738e..a63ea5de 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/ | |||
| 17 | sudo chmod 700 /var/lib/tox-bootstrapd/ | 17 | sudo chmod 700 /var/lib/tox-bootstrapd/ |
| 18 | ``` | 18 | ``` |
| 19 | 19 | ||
| 20 | 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. | 20 | 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. |
| 21 | 21 | ||
| 22 | Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd`. | 22 | Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh`. |
| 23 | 23 | ||
| 24 | Place `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd` tells. By default it's `/etc/tox-bootstrapd.conf`. | 24 | Place `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd` tells. By default it's `/etc/tox-bootstrapd.conf`. |
| 25 | 25 | ||
| 26 | Place `tox-bootstrapd` init file at `/etc/init.d/tox-bootstrapd`. | 26 | Place `tox-bootstrapd.sh` init file at `/etc/init.d/tox-bootstrapd` (note the disappearance of ".sh" ending). |
| 27 | 27 | ||
| 28 | Set permissions for the init system to run the script: | 28 | Set permissions for the init system to run the script: |
| 29 | ```sh | 29 | ```sh |
diff --git a/other/bootstrap_daemon/tox-bootstrapd b/other/bootstrap_daemon/tox-bootstrapd.sh index a6c137bd..a6c137bd 100644 --- a/other/bootstrap_daemon/tox-bootstrapd +++ b/other/bootstrap_daemon/tox-bootstrapd.sh | |||