From 9e9b5fe4239fb42de502113921c45c6045d99a9a Mon Sep 17 00:00:00 2001 From: fbrehm Date: Mon, 16 Apr 2012 15:42:01 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 2 +- config-archive/etc/ppd.cfg.default | 2 +- .../etc/ppd.cfg.default.1 | 22 +------------------ config-archive/etc/ppd.cfg.default.dist | 20 +++++++++++++++++ ppd.cfg.default | 20 +++++++++++++++++ 5 files changed, 43 insertions(+), 23 deletions(-) rename ._cfg0000_ppd.cfg.default => config-archive/etc/ppd.cfg.default.1 (89%) diff --git a/.etckeeper b/.etckeeper index 915fdc7..d2b7411 100755 --- a/.etckeeper +++ b/.etckeeper @@ -36,7 +36,6 @@ mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' -maybe chmod 0644 './._cfg0000_ppd.cfg.default' maybe chmod 0700 './.etckeeper' maybe chmod 0600 './.gitignore' maybe chmod 0600 './.pwd.lock' @@ -446,6 +445,7 @@ maybe chmod 0755 './config-archive/etc/portage/savedconfig/sys-apps' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist' maybe chmod 0644 './config-archive/etc/ppd.cfg.default' +maybe chmod 0644 './config-archive/etc/ppd.cfg.default.1' maybe chmod 0644 './config-archive/etc/ppd.cfg.default.dist' maybe chmod 0755 './config-archive/etc/pulse' maybe chmod 0644 './config-archive/etc/pulse/client.conf' diff --git a/config-archive/etc/ppd.cfg.default b/config-archive/etc/ppd.cfg.default index 17309e0..bb19539 100644 --- a/config-archive/etc/ppd.cfg.default +++ b/config-archive/etc/ppd.cfg.default @@ -197,7 +197,7 @@ timeout = 30 ; values are the URI's of the appropriate machines. ; Currently the only supported URI schema is vcb://, ; whats look like 'vcb://ip-adress[:port], where the standard port -; is 8072 +; is 8073 Storage01 = vcb://10.1.65.10:8073 Storage02 = vcb://10.1.65.20:8073 diff --git a/._cfg0000_ppd.cfg.default b/config-archive/etc/ppd.cfg.default.1 similarity index 89% rename from ._cfg0000_ppd.cfg.default rename to config-archive/etc/ppd.cfg.default.1 index 4c946bc..17309e0 100644 --- a/._cfg0000_ppd.cfg.default +++ b/config-archive/etc/ppd.cfg.default.1 @@ -190,26 +190,6 @@ timeout = 30 ; and the real destroying the volume. Default: 48 hours ;remove_delay = 172800 -; path to the dump-device.sh script for dumping a device to STDOUT -;dump_device_bin = /opt/profitbricks/bin/dump-device.sh - -[FtpServer] - -; some data to get informations about template images and -; to stream them to STDOUT via SSH - -Host = de-dc1-c1-ftp -; hostname or IP address of the FTP server, where the SSH daemon is accessible - -User = ppd -; the username on the FTP server to execute the image scripts as root by sudo - -ImageInfo = /home/ppd/work/image-info -; complete path name of the image info script to get the real size of the image - -ImageStream = /home/ppd/work/image-stream -; complete path name of the image stream script to stream the converted image to STDOUT - [StorageServer] ; in this chapter is a list of all available storage servers @@ -217,7 +197,7 @@ ImageStream = /home/ppd/work/image-stream ; values are the URI's of the appropriate machines. ; Currently the only supported URI schema is vcb://, ; whats look like 'vcb://ip-adress[:port], where the standard port -; is 8073 +; is 8072 Storage01 = vcb://10.1.65.10:8073 Storage02 = vcb://10.1.65.20:8073 diff --git a/config-archive/etc/ppd.cfg.default.dist b/config-archive/etc/ppd.cfg.default.dist index bb19539..4c946bc 100644 --- a/config-archive/etc/ppd.cfg.default.dist +++ b/config-archive/etc/ppd.cfg.default.dist @@ -190,6 +190,26 @@ timeout = 30 ; and the real destroying the volume. Default: 48 hours ;remove_delay = 172800 +; path to the dump-device.sh script for dumping a device to STDOUT +;dump_device_bin = /opt/profitbricks/bin/dump-device.sh + +[FtpServer] + +; some data to get informations about template images and +; to stream them to STDOUT via SSH + +Host = de-dc1-c1-ftp +; hostname or IP address of the FTP server, where the SSH daemon is accessible + +User = ppd +; the username on the FTP server to execute the image scripts as root by sudo + +ImageInfo = /home/ppd/work/image-info +; complete path name of the image info script to get the real size of the image + +ImageStream = /home/ppd/work/image-stream +; complete path name of the image stream script to stream the converted image to STDOUT + [StorageServer] ; in this chapter is a list of all available storage servers diff --git a/ppd.cfg.default b/ppd.cfg.default index bb19539..4c946bc 100644 --- a/ppd.cfg.default +++ b/ppd.cfg.default @@ -190,6 +190,26 @@ timeout = 30 ; and the real destroying the volume. Default: 48 hours ;remove_delay = 172800 +; path to the dump-device.sh script for dumping a device to STDOUT +;dump_device_bin = /opt/profitbricks/bin/dump-device.sh + +[FtpServer] + +; some data to get informations about template images and +; to stream them to STDOUT via SSH + +Host = de-dc1-c1-ftp +; hostname or IP address of the FTP server, where the SSH daemon is accessible + +User = ppd +; the username on the FTP server to execute the image scripts as root by sudo + +ImageInfo = /home/ppd/work/image-info +; complete path name of the image info script to get the real size of the image + +ImageStream = /home/ppd/work/image-stream +; complete path name of the image stream script to stream the converted image to STDOUT + [StorageServer] ; in this chapter is a list of all available storage servers -- 2.39.5