diff options
| author | Erich Eckner <git@eckner.net> | 2018-11-17 15:45:06 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-11-17 15:45:06 +0100 |
| commit | a4ee58328de27314a858071ac2dfc7b8cd45af2c (patch) | |
| tree | 958f1b5153db29aa29cb1f7061676128b48569ae | |
| parent | cdb5e2c694819e3201c335c462883758ce2f5baa (diff) | |
| download | builder-a4ee58328de27314a858071ac2dfc7b8cd45af2c.tar.xz | |
the user on the buildmaster is now "master" instead of "slave"
| -rwxr-xr-x | conf/master.conf.example | 4 | ||||
| -rwxr-xr-x | conf/slave.conf.example | 2 | ||||
| -rwxr-xr-x | lib/load-configuration | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/master.conf.example b/conf/master.conf.example index 9624fe3..96631d5 100755 --- a/conf/master.conf.example +++ b/conf/master.conf.example @@ -9,7 +9,7 @@ #repo_key='0xdeadbeef' # to access the master mirror via rsync -#master_mirror_rsync_command='rsync --password-file=/home/slave/rsync.password -l' +#master_mirror_rsync_command='rsync --password-file=/home/master/rsync.password -l' #master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' # to access the master mirror via sftp @@ -25,7 +25,7 @@ #build_log_directory='/srv/http/build-logs' # irc client configuration -#irc_dir='/home/slave/irc/irc.freenode.net' +#irc_dir='/home/master/irc/irc.freenode.net' #irc_password='top_secret' # list of urls to trigger updates of the respective mirrors diff --git a/conf/slave.conf.example b/conf/slave.conf.example index de730e0..ea03df7 100755 --- a/conf/slave.conf.example +++ b/conf/slave.conf.example @@ -8,7 +8,7 @@ #master_build_server="buildmaster.archlinux32.org" #master_build_server_port="22" -#master_build_server_user="slave" +#master_build_server_user="master" #master_build_server_identity="${work_dir}/.ssh/id_rsa" #package_key='0x15eebadc0de' diff --git a/lib/load-configuration b/lib/load-configuration index ef1a07c..cf7575b 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -54,14 +54,14 @@ fi master_build_server="buildmaster.archlinux32.org" master_build_server_port="22" -master_build_server_user="slave" +master_build_server_user="master" master_build_server_identity="${work_dir}/.ssh/id_rsa" repo_key='0xdeadbeef' package_key='0x15eebadc0de' # to access the master mirror via rsync -master_mirror_rsync_command='rsync --password-file=/home/slave/rsync.password -l' +master_mirror_rsync_command='rsync --password-file=/home/master/rsync.password -l' master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' # to access the master mirror via sftp @@ -88,7 +88,7 @@ webserver_directory='/srv/http' build_log_directory='/srv/http/build-logs' # irc client configuration -irc_dir='/home/slave/irc/irc.freenode.net' +irc_dir='/home/master/irc/irc.freenode.net' irc_password='top_secret' # commands to run to update the package mirror used for installing archlinux32 packages, |