From: Frank Brehm Date: Mon, 10 Jun 2013 17:29:46 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=942897a3d1a430f469c175a56498555727c77493;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/chef/.keep_app-admin_chef-0 b/chef/.keep_app-admin_chef-0 new file mode 100644 index 0000000..e69de29 diff --git a/chef/client.rb b/chef/client.rb new file mode 100644 index 0000000..a32a9c9 --- /dev/null +++ b/chef/client.rb @@ -0,0 +1,65 @@ +# Configuration File For Chef (chef-client) +# +# The chef-client program will connect the local system to the specified +# server URLs through a RESTful API to retrieve its configuration. +# +# By default, the client is configured to connect to a Chef Server +# running on the local system. Change this to reflect your environment. +# +# Chef uses a Ruby DSL for configuration, and this file contains a few +# Ruby idioms. First, symbols. These are designated by a colon sigil, ie, +# :value. Second, in Ruby, everything but false and nil (no quotes or other +# designations) is true, including true, the integer 0 and the string "false". +# So to set the value of a setting to false, write: +# +# some_setting false +# +# Third, Ruby class methods can be used, for example we tell the log to show +# the current time stamp with Chef::Log::Formatter.show_time, below. +# +# log_level specifies the level of verbosity for output. +# valid values are: :debug, :info, :warn, :error, :fatal + +log_level :info + +# log_location specifies where the client should log to. +# valid values are: a quoted string specifying a file, or STDOUT with +# no quotes. When run as a daemon (default), STDOUT will produce no output. + +log_location "/var/log/chef/client.log" + +# ssl_verify_mode specifies if the REST client should verify SSL certificates. +# valid values are :verify_none, :verify_peer. The default Chef Server +# installation will use a self-generated SSL certificate so this should be +# :verify_none unless you replace the certificate. + +ssl_verify_mode :verify_none + +# Server URLs. +# +# chef_server_url specifies the Chef Server to connect to. +# valid values are any HTTP URL (e.g. https://chef.example.com:4443). + +chef_server_url "http://localhost:4000" + +# file_cache_path specifies where the client should cache cookbooks, server +# cookie ID, and openid registration data. +# valid value is any filesystem directory location. + +file_cache_path "/var/lib/chef/cache" + +file_backup_path "/var/lib/chef/backup" + +# pid_file specifies the location of where chef-client daemon should keep the pid +# file. +# valid value is any filesystem file location. + +pid_file "/var/run/chef/client.pid" + +# Mixlib::Log::Formatter.show_time specifies whether the chef-client +# log should contain timestamps. valid values are true or false (no +# quotes, see above about Ruby idioms). The printed timestamp is +# rfc2822, for example: +# Fri, 31 Jul 2009 19:19:46 -0600 + +Mixlib::Log::Formatter.show_time = true diff --git a/chef/solo.rb b/chef/solo.rb new file mode 100644 index 0000000..250dd39 --- /dev/null +++ b/chef/solo.rb @@ -0,0 +1,49 @@ +# Configuration File For Chef Solo (chef-solo) +# +# The program chef-solo allows you to run Chef as a standalone program +# without connecting to a remote Chef Server. +# +# Chef uses a Ruby DSL for configuration, and this file may contain some +# Ruby idioms. First, symbols. These are designated by a colon sigil, ie, +# :value. Second, in Ruby, everything but false and nil (no quotes or other +# designations) is true, including true, the integer 0 and the string "false". +# So to set the value of a setting to false, write: +# +# some_setting false +# +# Third, Ruby class methods can be used, for example we tell the log to show +# the current time stamp with Mixlib::Log::Formatter.show_time, below. +# +# log_level specifies the level of verbosity for output. +# valid values are: :debug, :info, :warn, :error, :fatal + +log_level :info + +# log_location specifies where the client should log to. +# valid values are: a quoted string specifying a file, or STDOUT with +# no quotes. + +log_location "/var/log/chef/solo.log" + +# file_cache_path specifies where solo should look for the cookbooks to use +# valid value is any filesystem directory location. This is slightly +# different from 'normal' client mode as solo is actually downloading (or +# using) the specified cookbooks in this location. + +file_cache_path "/var/lib/chef" + +# cookbook_path specifies where solo should look for cookbooks it will use. +# valid value is a string, or array of strings of filesystem directory locations. +# This setting is similar to the server setting of the same name. Solo will use +# this as a search location, in Array order. It should be a subdirectory of +# file_cache_path, above. + +cookbook_path [ "/var/lib/chef/cookbooks" ] + +# Mixlib::Log::Formatter.show_time specifies whether the chef-client log should +# contain timestamps. +# valid values are true or false (no quotes, see above about Ruby idioms). The +# printed timestamp is rfc2822, for example: +# Fri, 31 Jul 2009 19:19:46 -0600 + +Mixlib::Log::Formatter.show_time = true diff --git a/conf.d/chef-client b/conf.d/chef-client new file mode 100644 index 0000000..b32d70f --- /dev/null +++ b/conf.d/chef-client @@ -0,0 +1,19 @@ +# /etc/conf.d/chef-client: config file for /etc/init.d/chef-client + +# The configuration file to use. +#CONFIGFILE="/etc/chef/client.rb" + +# Run chef-client periodically, in seconds. +#INTERVAL=1800 + +# The splay time for running at intervals, in seconds. +#SPLAY=20 + +# Any radom options you want to pass to chef. +#CHEF_CLIENT_OPTS="" + +# Path to the chef client binary. +#CHEF_CLIENT_BINARY="/usr/bin/chef-client" + +# PID file location. +#CHEF_CLIENT_PIDFILE="/var/run/chef/client.pid" diff --git a/fstab b/fstab index 3ac4883..95c0fe6 100644 --- a/fstab +++ b/fstab @@ -26,6 +26,7 @@ /dev/vg1/distfiles /usr/portage/distfiles ext4 noatime 0 0 /dev/vg1/home /home ext4 acl,user_xattr 0 0 /dev/vg1/images /var/lib/vbox ext4 noatime 0 0 +/dev/vg1/storage /storage ext4 acl,user,user_xattr 0 0 /dev/cdrom /mnt/cdrom auto noauto,ro 0 0 /dev/fd0 /mnt/floppy auto noauto 0 0 diff --git a/group b/group index 43aa527..61d68c4 100644 --- a/group +++ b/group @@ -65,3 +65,4 @@ postdrop:x:208: sabayon-admin:x:982: apache:x:81: dropbox:x:981: +chef:x:980: diff --git a/group- b/group- index 6d95710..43aa527 100644 --- a/group- +++ b/group- @@ -64,3 +64,4 @@ postfix:x:207: postdrop:x:208: sabayon-admin:x:982: apache:x:81: +dropbox:x:981: diff --git a/gshadow b/gshadow index 9244147..9b88138 100644 --- a/gshadow +++ b/gshadow @@ -65,3 +65,4 @@ postdrop:!:: sabayon-admin:!:: apache:!:: dropbox:!:: +chef:!:: diff --git a/gshadow- b/gshadow- index 24eb67b..9244147 100644 --- a/gshadow- +++ b/gshadow- @@ -64,3 +64,4 @@ postfix:!:: postdrop:!:: sabayon-admin:!:: apache:!:: +dropbox:!:: diff --git a/init.d/chef-client b/init.d/chef-client new file mode 100755 index 0000000..35652fa --- /dev/null +++ b/init.d/chef-client @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +CONFIGFILE=${CONFIGFILE:-/etc/chef/client.rb} +INTERVAL=${INTERVAL:-1800} +SPLAY=${SPLAY:-20} +ENCODING=${ENCODING:-UTF-8} + +pidfile=${CHEF_CLIENT_PIDFILE:-/var/run/chef/client.pid} +command=${CHEF_CLIENT_BINARY:-/usr/bin/ruby19} +command_args="-E ${ENCODING} /usr/bin/chef-client -d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} -P ${pidfile} ${CHEF_CLIENT_OPTS}" + +depend() { + need net +} + +start_pre() { + checkpath -q -d /var/run/chef +} diff --git a/passwd b/passwd index b9c3496..b2a52ff 100644 --- a/passwd +++ b/passwd @@ -46,3 +46,4 @@ apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin fbrehm:x:1022:100:Frank Brehm:/home/fbrehm:/bin/bash mbalser:x:1051:100:Michael Balser:/home/mbalser:/bin/bash ppd:x:999:100:PB Provisioning Daemon user Samara:/var/lib/py-provisioning-daemon/home:/bin/bash +chef:x:118:980:added by portage for chef:/var/lib/chef:/sbin/nologin diff --git a/passwd- b/passwd- index 7777462..b9c3496 100644 --- a/passwd- +++ b/passwd- @@ -45,4 +45,4 @@ sabayon-admin:x:117:982:added by portage for sabayon:/var/lib/sabayon:/sbin/nolo apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin fbrehm:x:1022:100:Frank Brehm:/home/fbrehm:/bin/bash mbalser:x:1051:100:Michael Balser:/home/mbalser:/bin/bash -ppd:x:999:100:PB Provisioning Daemon user stralsund:/var/lib/py-provisioning-daemon/home:/bin/bash +ppd:x:999:100:PB Provisioning Daemon user Samara:/var/lib/py-provisioning-daemon/home:/bin/bash diff --git a/portage/package.keywords/chef b/portage/package.keywords/chef new file mode 100644 index 0000000..486fcec --- /dev/null +++ b/portage/package.keywords/chef @@ -0,0 +1,61 @@ +# required by chef (argument) +=app-admin/chef-10.24.0 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/bunny-0.8.0 ~amd64 + +# required by dev-ruby/ohai-0.6.12[ruby_targets_ruby18] +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/ipaddress-0.8.0 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/mixlib-authentication-1.3.0 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/mixlib-cli-1.3.0 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/mixlib-config-1.1.2 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/mixlib-log-1.4.1 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/mixlib-shellout-1.1.0 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/moneta-0.6.0-r1 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/net-ssh-multi-1.1 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/ohai-0.6.12 ~amd64 + +# required by dev-ruby/treetop-1.4.10-r1[ruby_targets_ruby19] +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/polyglot-0.3.3 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/rest-client-1.6.7-r1 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/treetop-1.4.10-r1 ~amd64 + +# required by app-admin/chef-10.24.0[ruby_targets_ruby19] +# required by chef (argument) +=dev-ruby/yajl-ruby-1.1.0 ~amd64 + diff --git a/portage/package.keywords/vagrant b/portage/package.keywords/vagrant new file mode 100644 index 0000000..e3e44ac --- /dev/null +++ b/portage/package.keywords/vagrant @@ -0,0 +1,29 @@ +# required by vagrant (argument) +=app-emulation/vagrant-1.2.2 ~amd64 + +# required by dev-ruby/erubis-2.7.0[ruby_targets_ruby19] +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/abstract-1.0.0-r1 ~amd64 + +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/childprocess-0.3.9 ~amd64 + +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/erubis-2.7.0 ~amd64 + +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/i18n-0.6.4 ~amd64 + +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/net-scp-1.1.0 ~amd64 + +# required by app-emulation/vagrant-1.2.2[ruby_targets_ruby19] +# required by vagrant (argument) +=dev-ruby/net-ssh-2.6.7 ~amd64 + + diff --git a/shadow b/shadow index 14f4259..89cbc7a 100644 --- a/shadow +++ b/shadow @@ -45,3 +45,4 @@ apache:!:15773:::::: fbrehm:$6$IRNg3XEU$3PmbAFYn368KhupEXXESVkOqe4ciyzzYzaZFIGQy/4lJEKGlrLixVodFK2lhGfCyDjP4hdYVlFiFoKVCJNul5.:15775:0:99999:7::: mbalser:!:15775:0:99999:7::: ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15777:::::: +chef:!:15853:::::: diff --git a/shadow- b/shadow- index 7a5c1f6..14f4259 100644 --- a/shadow- +++ b/shadow- @@ -44,4 +44,4 @@ sabayon-admin:!:15772:::::: apache:!:15773:::::: fbrehm:$6$IRNg3XEU$3PmbAFYn368KhupEXXESVkOqe4ciyzzYzaZFIGQy/4lJEKGlrLixVodFK2lhGfCyDjP4hdYVlFiFoKVCJNul5.:15775:0:99999:7::: mbalser:!:15775:0:99999:7::: -ppd:!:15777:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15777::::::