From: fbrehm Date: Mon, 16 Apr 2012 13:40:20 +0000 (+0200) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1344dbb26b337e66748e160300bb4b0ff33fe2e2;p=config%2Fsamara%2Fetc.git committing changes in /etc after emerge run Package changes: --- diff --git a/.etckeeper b/.etckeeper index 41d6fe7..915fdc7 100755 --- a/.etckeeper +++ b/.etckeeper @@ -266,7 +266,6 @@ maybe chmod 0644 './conf.d/ntpd' maybe chmod 0644 './conf.d/openvpn' maybe chmod 0644 './conf.d/pciparm' maybe chmod 0644 './conf.d/postgresql-9.1' -maybe chmod 0644 './conf.d/ppd' maybe chmod 0644 './conf.d/pydoc-2.7' maybe chmod 0644 './conf.d/pydoc-3.2' maybe chmod 0644 './conf.d/rfcomm' @@ -529,7 +528,6 @@ maybe chgrp mail './courier/authlib/authpgsqlrc.dist' maybe chmod 0660 './courier/authlib/authpgsqlrc.dist' maybe chmod 0755 './cron.d' maybe chmod 0644 './cron.d/.keep_sys-process_vixie-cron-0' -maybe chmod 0644 './cron.d/py-provisioning-daemon' maybe chmod 0750 './cron.daily' maybe chmod 0644 './cron.daily/.keep_sys-process_cronbase-0' maybe chmod 0755 './cron.daily/00-logwatch' @@ -1109,7 +1107,6 @@ maybe chmod 0755 './init.d/pciparm' maybe chmod 0755 './init.d/php-fpm' maybe chmod 0755 './init.d/postfix' maybe chmod 0755 './init.d/postgresql-9.1' -maybe chmod 0755 './init.d/ppd' maybe chmod 0755 './init.d/procfs' maybe chmod 0755 './init.d/pwcheck' maybe chmod 0755 './init.d/pydoc-2.7' @@ -1275,7 +1272,6 @@ maybe chmod 0644 './motd.tail' maybe chmod 0644 './mtab' maybe chmod 0755 './mtools' maybe chmod 0644 './mtools/mtools.conf' -maybe chmod 0644 './multipath.conf' maybe chmod 0755 './mysql' maybe chmod 0644 './mysql/my.cnf' maybe chmod 0644 './mysql/mysqlaccess.conf' @@ -1474,7 +1470,6 @@ maybe chmod 0644 './postfix/master.cf' maybe chmod 0600 './postfix/saslpass' maybe chmod 0755 './postgresql-9.1' maybe chmod 0644 './postgresql-9.1/.keep_dev-db_postgresql-base-9.1' -maybe chmod 0644 './ppd.cfg' maybe chmod 0644 './ppd.cfg.default' maybe chmod 0755 './ppp' maybe chmod 0600 './ppp/chap-secrets' @@ -1727,8 +1722,6 @@ maybe chmod 0400 './ssl/postfix/server.pem' maybe chmod 0700 './ssl/private' maybe chmod 0644 './ssl/private/.keep_dev-libs_openssl-0' maybe chmod 0440 './sudoers' -maybe chmod 0755 './sudoers.d' -maybe chmod 0644 './sudoers.d/ppd' maybe chmod 0644 './sysctl.conf' maybe chmod 0755 './sysctl.d' maybe chmod 0644 './sysctl.d/libvirtd.conf' @@ -1835,9 +1828,6 @@ maybe chmod 0644 './timidity.cfg' maybe chmod 0755 './udev' maybe chmod 0755 './udev/rules.d' maybe chmod 0644 './udev/rules.d/.keep_sys-fs_udev-0' -maybe chmod 0644 './udev/rules.d/60-kpartx.rules' -maybe chmod 0644 './udev/rules.d/60-persistent-storage-dm.rules' -maybe chmod 0644 './udev/rules.d/70-iscsi.rules' maybe chmod 0644 './udev/rules.d/70-persistent-cd.rules' maybe chmod 0644 './udev/rules.d/70-persistent-net.rules' maybe chmod 0644 './udev/rules.d/77-mm-ericsson-mbm.rules' diff --git a/conf.d/ppd b/conf.d/ppd deleted file mode 100644 index 533a9b3..0000000 --- a/conf.d/ppd +++ /dev/null @@ -1,53 +0,0 @@ -# Defaults for py-provisioning-daemon initscript -# sourced by /etc/init.d/ppd and /usr/sbin/ppd-watchdog -# installed at /etc/default/ppd by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Verbosity of the init script -VERBOSE=yes - -# Path to the executable ppd -#PPD="/usr/sbin/ppd" - -# Path to the watchdog executable -#PPD_WATCHDOG="/usr/sbin/ppd-watchdog" - -# Working directory of ppd -#PPD_DIR="/var/lib/py-provisioning-daemon" - -# Log file of the PPD watchdog process -#WATCHDOG_LOG="/var/log/ppd-watchdog.log" - -# Watchdog PID file -#WATCHDOG_PID_FILE="/var/run/ppd-watchdog.pid" - -# Start-stop-logfile -#START_LOG="/var/log/ppd-start.log" - -# PID file of PPD itself -#PPD_PIDFILE="${PPD_DIR}/ppd.pid" - -# Debug mode for the PPD watchdog process (0 or 1) -#DEBUG=1 - -# Syslog facility for the PPD watchdog process -#LOG_FACILITY="daemon" - -# if an existent file, no watchdog will started, only PPD itself -#NO_WATCHDOG_FILE="${PPD_DIR}/no-watchdog" - -# enable external watchdog -#ENABLE_EXTERNAL_WATCHDOG=yes - -# Main configuration file of ppd -#PPD_CONFIG="/etc/ppd.cfg" - -# Additional arguments that are passed to the Daemon. -#DAEMON_ARGS="-v -F ${LOG_FACILITY}" -#DAEMON_ARGS="-v" -#DAEMON_ARGS="" - -# vim: ts=4 expandtab fileencoding=utf-8 filetype=sh diff --git a/cron.d/py-provisioning-daemon b/cron.d/py-provisioning-daemon deleted file mode 100644 index e14824c..0000000 --- a/cron.d/py-provisioning-daemon +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/cron.d/py-provisioning-daemon: crontab entries for the py-provisioning-daemon - -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -1-59/10 * * * * ppd test -x /opt/profitbricks/bin/perform-ppd-trace-data.sh && /opt/profitbricks/bin/perform-ppd-trace-data.sh &>/dev/null - -# vim: filetype=crontab ts=4 diff --git a/init.d/ppd b/init.d/ppd deleted file mode 100755 index da92cbc..0000000 --- a/init.d/ppd +++ /dev/null @@ -1,184 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload watchdogrestart watchdogcrashrestart" - -# Path to the daemon -PPD="/usr/sbin/ppd" - -# Path to the watchdog executable -PPD_WATCHDOG="/usr/sbin/ppd-watchdog" - -# Introduce a short description here -DESC="PB python provisioning daemon" - -# Working directory -PPD_DIR="/var/lib/py-provisioning-daemon" - -# enable external watchdog -ENABLE_EXTERNAL_WATCHDOG=yes - -# Watchdog PID file -WATCHDOG_PID_FILE="/var/run/ppd-watchdog.pid" - -# PID file of PPD itself -PPD_PIDFILE="${PPD_DIR}/ppd.pid" - -WATCHDOG_NAME="ppd-watchdog" -LOG_FACILITY="daemon" - -#------------------------------------------------------------------- -depend() { - need net netmount logger -} - -#------------------------------------------------------------------- -wait_on_pid() { - - local pid="${1}" - - log "Waiting for PID ${pid} for ending" - - running=0 - if kill -0 "${pid}" 2>/dev/null ; then - running=1 - fi - - while [ "${running}" = "1" ] ; do - - sleep 1 - if kill -0 "${pid}" 2>/dev/null ; then - running=1 - else - running=0 - fi - - done - -} - -#------------------------------------------------------------------- -start_watchdog() { - if [ "${ENABLE_EXTERNAL_WATCHDOG}" != "yes" ] ; then - return 0 - fi - ebegin "Starting ${DESC} watchdog" - start-stop-daemon \ - --start \ - --background \ - --make-pidfile \ - --pidfile "${WATCHDOG_PID_FILE}" \ - --exec "${PPD_WATCHDOG}" \ - --name "${WATCHDOG_NAME}" - eend $? "Failed to Start ${DESC} watchdog" -} - -#------------------------------------------------------------------- -start_ppd() { - ebegin "Starting ${DESC}" - start-stop-daemon --start --pidfile ${PPD_PIDFILE} --exec ${PPD} ${DAEMON_ARGS} - eend $? "Failed to Start ${DESC}" -} - -#------------------------------------------------------------------- -stop_ppd() { - - local signal="-s TERM" - if [ "${1}" = "graceful" ] ; then - signal="-s HUP" - fi - - ebegin "Stopping ${DESC}" - if [ -f "${PPD_PIDFILE}" ] ; then - PID=$(cat "${PPD_PIDFILE}") - else - PID=$(pidof 'python /usr/sbin/ppd') - fi - - if [ -n "${PID}" ]; then - kill ${signal} ${PID} - eend $? "Failed to Stop ${DESC}" - else - ewarn "${DESC} not running" - fi - -} - -#------------------------------------------------------------------- -stop_watchdog() { - - if [ "${ENABLE_EXTERNAL_WATCHDOG}" = "yes" ] ; then - ebegin "Stopping ${DESC} watchdog" - start-stop-daemon \ - --stop \ - --pidfile "${WATCHDOG_PID_FILE}" \ - --name "${WATCHDOG_NAME}" - eend $? "Failed to Stop ${DESC} watchdog" - else - start-stop-daemon \ - --stop \ - --pidfile "${WATCHDOG_PID_FILE}" \ - --name "${WATCHDOG_NAME}" \ - --quiet - fi -} - -#------------------------------------------------------------------- -watchdogrestart() { - - local noisy="n" - if [ "${1}" = "noisy" ] ; then - noisy="y" - fi - - stop_ppd - start_ppd - if [ "${noisy}" = "y" ]; then - logger -i -t ppd-init \ - -p "${LOG_FACILITY}".warning \ - "${DESC} died, restarted" - fi - -} - -#------------------------------------------------------------------- -watchdogcrashrestart() { - watchdogrestart noisy -} - -#------------------------------------------------------------------- -start() { - start_ppd || return 1 - start_watchdog || return 2 -} - -#------------------------------------------------------------------- -stop() { - stop_watchdog || return 2 - stop_ppd -} - -#------------------------------------------------------------------- -restart() { - stop_watchdog - stop_ppd - start_ppd || return 1 - start_watchdog || return 2 -} - -#------------------------------------------------------------------- -reload() { - #stop_ppd graceful - local PID - if [ -f "${WATCHDOG_PID_FILE}" ] ; then - PID=$(cat "${WATCHDOG_PID_FILE}") - kill -s HUP "${PID}" - else - PID=$(pidof 'python /usr/sbin/ppd') - wait_on_pid "${PID}" - start_ppd - fi -} - -# vim: ts=4 filetype=gentoo-init-d fileencoding=utf-8 diff --git a/multipath.conf b/multipath.conf deleted file mode 100644 index c98b720..0000000 --- a/multipath.conf +++ /dev/null @@ -1,67 +0,0 @@ -blacklist { -} - -defaults { -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered -# # failback expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : manual -# # - failback 10 - -# # name : selector -# # scope : multipath -# # desc : the default path selector algorithm to use -# # these algorithms are offered by the kernel multipath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# selector "round-robin 0" - -# # name : path_grouping_policy -# # scope : multipath -# # desc : the default path grouping policy to apply to unspecified -# # multipaths -# # values : failover = 1 path per priority group -# # multibus = all valid paths in 1 priority group -# # group_by_serial = 1 priority group per detected serial -# # number -# # group_by_prio = 1 priority group per path priority -# # w value -# # group_by_node_name = 1 priority group per target node name -# # default : failover -# # -# path_grouping_policy failover - -# # name : user_friendly_names -# # scope : multipath -# # desc : If set to "yes", using the bindings file -# # /var/lib/multipath/bindings to assign a persistent and -# # unique alias to the multipath, in the form of mpath. -# # If set to "no" use the WWID as the alias. In either case -# # this be will be overriden by any specific aliases in this -# # file. -# # values : yes|no -# # default : no -# user_friendly_names no - -# # name : path_checker, checker -# # scope : multipath & multipathd -# # desc : the default method used to determine the paths' state -# # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac|cciss_tur -# # default : directio -# path_checker directio - -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) - no_path_retry queue - -} diff --git a/ppd.cfg b/ppd.cfg deleted file mode 100644 index 5a09597..0000000 --- a/ppd.cfg +++ /dev/null @@ -1,50 +0,0 @@ -[General] - -operation_type = storage - -base_dir = /var/lib/py-provisioning-daemon -plugin_dir = /usr/share/py-provisioning-daemon/plugins -error_log = %(base_dir)s/error.log -trace_dir = %(base_dir)s/trace -do_trace = yes -;port = 8072 -;port = 8073 -request_timeout = 90 -xml_log = True -max_children = 50 - -node_name = ${HOSTNAME} -broadcast_address = 10.1.255.255 -mgmt_address = ${HOST_IP} - -;request_timeout = 30 -;polling_interval = 0.2 -;request_queue_size = 5 - -user = ppd -group = staff - -[Storage] - -zfs_pool = storage/volumes -;iscsi_target_group = cloudstorage -enable_replication = True -host_master = storage01-ib -host_backup = storage02-ib -host_backup_mgmt = vcb://storage02:8073 -; receive_port_dir = /var/lib/py-provisioning-daemon/zfs-receive - -replication_role = master - -[ProvWebService] -url = https://appserver/ProvisioningService/ProvisioningServiceWSService -user = profitbricks-vcb -pwd = ProfitBricks-VCB -timeout = 60 - -[PdtService] -url = https://appserver/PDTService/PDTService?wsdl -user = profitbricks-dms -pwd = ProfitBricks-DMS - -; vim: ts=4 expandtab fileencoding=utf-8 filetype=cfg diff --git a/sudoers.d/ppd b/sudoers.d/ppd deleted file mode 100644 index 18fee04..0000000 --- a/sudoers.d/ppd +++ /dev/null @@ -1,3 +0,0 @@ -# Enable commands for ppd (user of the ProfitBricks Python provisioning daemon) -#ppd ALL=(root) NOPASSWD: /sbin/dmsetup, /usr/bin/iscsiadm, /sbin/udevadm, /sbin/blockdev, /bin/chown, /sbin/parted, /bin/mount, /bin/umount, /sbin/kpartx, /sbin/losetup, /usr/bin/mkpasswd, /bin/chmod, /sbin/blkid, /sbin/mkswap, /sbin/resize2fs, /sbin/partprobe, /sbin/modprobe, /bin/rm, /usr/bin/ssh-keygen, /usr/share/py-provisioning-daemon/delete_blockdevice.sh, /usr/share/py-provisioning-daemon/rescan_iscsi_bus.sh, /lib/udev/scsi_id -ppd ALL=(root) NOPASSWD: ALL diff --git a/udev/rules.d/60-kpartx.rules b/udev/rules.d/60-kpartx.rules deleted file mode 100644 index b8cf8ed..0000000 --- a/udev/rules.d/60-kpartx.rules +++ /dev/null @@ -1,42 +0,0 @@ -# -# persistent links for device-mapper devices -# only hardware-backed device-mapper devices (ie multipath, dmraid, -# and kpartx) have meaningful persistent device names -# - -KERNEL!="dm-*", GOTO="kpartx_end" -ACTION=="remove", GOTO="kpartx_end" - -# This is a temporary hack until Debian's dmsetup properly supports "dmsetup -# export". For more information see: #434241, #487881, #493078 -IMPORT{program}="dmsetup_env %M %m" - -ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end" - -ENV{DM_UUID}=="?*", IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}" - -OPTIONS="link_priority=50" - -# Create persistent links for multipath tables -ENV{DM_UUID}=="mpath-*", \ - SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}" - -# Create persistent links for dmraid tables -ENV{DM_UUID}=="dmraid-*", \ - SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}" - -# Create persistent links for partitions -ENV{DM_PART}=="?*", \ - SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}-part$env{DM_PART}" - -# Create dm tables for partitions - -# Deactivated creating of partition devices for DM devices -# (Frank + Michael, 2012-01-17) -#ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ -# RUN+="/sbin/kpartx -a -p -part /dev/$name" -ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ - RUN+="/sbin/kpartx -a -p -part /dev/$name" - -LABEL="kpartx_end" - diff --git a/udev/rules.d/60-persistent-storage-dm.rules b/udev/rules.d/60-persistent-storage-dm.rules deleted file mode 100644 index 7a767bd..0000000 --- a/udev/rules.d/60-persistent-storage-dm.rules +++ /dev/null @@ -1,18 +0,0 @@ -# Udev rules for device-mapper devices. -# See /usr/share/doc/dmsetup/README.udev for further information. -# -#ENV{DM_UDEV_RULES}=="", GOTO="persistent_storage_dm_end" -# -#OPTIONS="link_priority=-100" -#ENV{DM_UUID}=="DMRAID-*", OPTIONS="link_priority=100" -# -#SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" -#ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" -# -#ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}!="", GOTO="persistent_storage_dm_end" -# -#IMPORT{program}="/sbin/blkid -o udev -p $tempnode" -#ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" -#ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" -# -#LABEL="persistent_storage_dm_end" diff --git a/udev/rules.d/70-iscsi.rules b/udev/rules.d/70-iscsi.rules deleted file mode 100644 index a9043b3..0000000 --- a/udev/rules.d/70-iscsi.rules +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/udev/rules.d/70-iscsi.rules -# ENV{ID_MODEL}=="COMSTAR", ENV{ID_SERIAL_SHORT}=="600144f0*", ENV{DEVTYPE}=="disk", SYMLINK="iscsi-$env{ID_SERIAL_SHORT}" -# ENV{ID_MODEL}=="COMSTAR", ENV{ID_SERIAL_SHORT}=="600144f0*", ENV{DEVTYPE}=="disk", SYMLINK="mapper/$env{ID_SERIAL}" -# ENV{DM_TYPE}=="scsi", ENV{DM_NAME}=="3600144f0*", ENV{DEVTYPE}=="disk", SYMLINK="iscsi-dm-$env{DM_NAME}" - -ENV{ID_MODEL}=="COMSTAR", ENV{ID_SERIAL_SHORT}=="600144f0*" -