Skip to content

Commit

Permalink
detab
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhelmer
rhelmer committed May 1, 2012
1 parent a30dab9 commit 617be92
Showing 1 changed file with 61 additions and 61 deletions.
122 changes: 61 additions & 61 deletions puppet/manifests/classes/socorro-base.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
ensure => present,
source => "/home/socorro/dev/socorro/puppet/files/etc_profile.d/java.sh";

'/etc/hosts':
owner => root,
group => root,
mode => 644,
ensure => present,
source => "/home/socorro/dev/socorro/puppet/files/hosts";

'/data':
'/etc/hosts':
owner => root,
group => root,
mode => 644,
ensure => present,
source => "/home/socorro/dev/socorro/puppet/files/hosts";

'/data':
owner => root,
group => root,
mode => 755,
Expand All @@ -29,58 +29,58 @@
owner => socorro,
group => socorro,
mode => 755,
recurse=> false,
ensure => directory;
recurse=> false,
ensure => directory;

'/etc/socorro':
owner => socorro,
group => socorro,
mode => 755,
recurse=> true,
ensure => directory,
source => "/home/socorro/dev/socorro/puppet/files/etc_socorro";
recurse=> true,
ensure => directory,
source => "/home/socorro/dev/socorro/puppet/files/etc_socorro";

'/etc/cron.d':
owner => root,
group => root,
ensure => directory,
recurse => true,
require => File['/etc/socorro'],
source => "/home/socorro/dev/socorro/puppet/files/etc_crond";
source => "/home/socorro/dev/socorro/puppet/files/etc_crond";

'/etc/socorro/socorrorc':
ensure => link,
'/etc/socorro/socorrorc':
ensure => link,
require => Exec['socorro-install'],
target=> "/data/socorro/application/scripts/crons/socorrorc";
target=> "/data/socorro/application/scripts/crons/socorrorc";

'/etc/rsyslog.conf':
'/etc/rsyslog.conf':
require => Package[rsyslog],
owner => root,
group => root,
mode => 644,
ensure => present,
notify => Service[rsyslog],
source => "/home/socorro/dev/socorro/puppet/files/rsyslog.conf";
owner => root,
group => root,
mode => 644,
ensure => present,
notify => Service[rsyslog],
source => "/home/socorro/dev/socorro/puppet/files/rsyslog.conf";

# FIXME break this out to separate classes
'etc_supervisor':
'etc_supervisor':
path => "/etc/supervisor/conf.d/",
recurse => true,
require => [Package['supervisor'], Exec['socorro-install']],
#notify => Service[supervisor],
#notify => Service[supervisor],
source => "/home/socorro/dev/socorro/puppet/files/etc_supervisor";

'/var/log/socorro':
owner => socorro,
group => socorro,
mode => 644,
recurse=> true,
ensure => directory;
recurse=> true,
ensure => directory;

'/home/socorro/persistent':
owner => socorro,
group => socorro,
ensure => directory;
'/home/socorro/persistent':
owner => socorro,
group => socorro,
ensure => directory;

}

Expand Down Expand Up @@ -133,40 +133,40 @@
class socorro-python inherits socorro-base {

user { 'socorro':
ensure => 'present',
uid => '10000',
shell => '/bin/bash',
ensure => 'present',
uid => '10000',
shell => '/bin/bash',
groups => 'admin',
managehome => true;
managehome => true;
}

file {
'/home/socorro':
require => User[socorro],
require => User[socorro],
owner => socorro,
group => socorro,
mode => 775,
recurse=> false,
ensure => directory;
recurse=> false,
ensure => directory;
}

file {
'/home/socorro/dev':
require => File['/home/socorro'],
require => File['/home/socorro'],
owner => socorro,
group => socorro,
mode => 775,
recurse=> false,
ensure => directory;
recurse=> false,
ensure => directory;
}

# FIXME
# '/etc/logrotate.d/socorro':
# ensure => present,
# source => $fqdn ? {
# /sjc1.mozilla.com$/ => "puppet://$server/modules/socorro/stage/etc-logrotated/socorro",
# default => "puppet://$server/modules/socorro/prod/etc-logrotated/socorro",
# };
# source => $fqdn ? {
# /sjc1.mozilla.com$/ => "puppet://$server/modules/socorro/stage/etc-logrotated/socorro",
# default => "puppet://$server/modules/socorro/prod/etc-logrotated/socorro",
# };
package {
['python-psycopg2', 'python-simplejson', 'subversion', 'libpq-dev',
'python-virtualenv', 'python-dev']:
Expand Down Expand Up @@ -245,8 +245,8 @@
group => root,
mode => 644,
ensure => present,
notify => Service[apache2],
source => "/home/socorro/dev/socorro/puppet/files/etc_apache2_sites-available/crash-stats";
notify => Service[apache2],
source => "/home/socorro/dev/socorro/puppet/files/etc_apache2_sites-available/crash-stats";

'/var/log/socorro/kohana':
require => Package[apache2],
Expand All @@ -255,14 +255,14 @@
mode => 755,
ensure => directory;

'/etc/php.ini':
'/etc/php.ini':
require => Package[apache2],
owner => root,
group => root,
mode => 644,
ensure => present,
notify => Service[apache2],
source => "/home/socorro/dev/socorro/puppet/files/php.ini";
owner => root,
group => root,
mode => 644,
ensure => present,
notify => Service[apache2],
source => "/home/socorro/dev/socorro/puppet/files/php.ini";

'/data/socorro/htdocs/application/logs':
require => Exec['socorro-install'],
Expand All @@ -272,10 +272,10 @@
# FIXME
# '/etc/logrotate.d/kohana':
# ensure => present,
# source => $fqdn ? {
# /sjc1.mozilla.com$/ => "puppet://$server/modules/socorro/stage/etc-logrotated/kohana",
# default => "puppet://$server/modules/socorro/prod/etc-logrotated/kohana",
# };
# source => $fqdn ? {
# /sjc1.mozilla.com$/ => "puppet://$server/modules/socorro/stage/etc-logrotated/kohana",
# default => "puppet://$server/modules/socorro/prod/etc-logrotated/kohana",
# };

}

Expand Down Expand Up @@ -329,8 +329,8 @@

package {
['memcached', 'libcrypt-ssleay-perl', 'php5-pgsql', 'php5-curl',
'php5-dev', 'php5-tidy', 'php-pear', 'php5-common', 'php5-cli',
'php5-memcache', 'php5', 'php5-gd', 'php5-mysql', 'php5-ldap',
'php5-dev', 'php5-tidy', 'php-pear', 'php5-common', 'php5-cli',
'php5-memcache', 'php5', 'php5-gd', 'php5-mysql', 'php5-ldap',
'phpunit']:
ensure => latest,
require => Exec['apt-get-update'];
Expand Down

0 comments on commit 617be92

Please sign in to comment.