| OLD | NEW | 
|    1 class trac( |    1 class trac( | 
|    2     $domain, |    2     $domain, | 
|    3     $is_default = false) inherits private::trac { |    3     $is_default = false) inherits private::trac { | 
|    4   package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']: |    4   package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']: | 
|    5     ensure => present |    5     ensure => present | 
|    6   } |    6   } | 
|    7  |    7  | 
|    8   include nginx, spawn-fcgi |    8   include nginx, spawn-fcgi | 
|    9  |    9  | 
|   10   file {'/etc/nginx/adblockplus.org_sslcert.key': |   10   file {'/etc/nginx/adblockplus.org_sslcert.key': | 
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  102     require => Package['subversion', 'python-pip'], |  102     require => Package['subversion', 'python-pip'], | 
|  103     unless => "python -c 'import autocompleteusers'", |  103     unless => "python -c 'import autocompleteusers'", | 
|  104   } |  104   } | 
|  105  |  105  | 
|  106   exec { 'install_MasterTickets': |  106   exec { 'install_MasterTickets': | 
|  107     command => "pip install svn+http://trac-hacks.org/svn/masterticketsplugin/tr
     unk/", |  107     command => "pip install svn+http://trac-hacks.org/svn/masterticketsplugin/tr
     unk/", | 
|  108     require => Package['subversion', 'python-pip', 'graphviz'], |  108     require => Package['subversion', 'python-pip', 'graphviz'], | 
|  109     unless => "python -c 'import mastertickets'", |  109     unless => "python -c 'import mastertickets'", | 
|  110   } |  110   } | 
|  111  |  111  | 
 |  112   exec { 'install_NeverNotifyUpdater': | 
 |  113     command => "pip install svn+http://trac-hacks.org/svn/nevernotifyupdaterplug
     in/1.0/", | 
 |  114     require => Package['subversion', 'python-pip'], | 
 |  115     unless => "python -c 'import nevernotifyupdaterplugin'", | 
 |  116   } | 
 |  117  | 
|  112   file {"/home/trac/environment/conf/trac.ini": |  118   file {"/home/trac/environment/conf/trac.ini": | 
|  113     ensure => present, |  119     ensure => present, | 
|  114     content => template('trac/trac.ini.erb'), |  120     content => template('trac/trac.ini.erb'), | 
|  115     owner => trac, |  121     owner => trac, | 
|  116     require => Exec['trac_env'] |  122     require => Exec['trac_env'] | 
|  117   } |  123   } | 
|  118  |  124  | 
|  119   file {"/home/trac/htdocs/htdocs/common/adblockplus_logo.png": |  125   file {"/home/trac/htdocs/htdocs/common/adblockplus_logo.png": | 
|  120     ensure => present, |  126     ensure => present, | 
|  121     source => 'puppet:///modules/trac/adblockplus_logo.png', |  127     source => 'puppet:///modules/trac/adblockplus_logo.png', | 
|  122     owner => trac, |  128     owner => trac, | 
|  123     require => Exec['deploy'] |  129     require => Exec['deploy'] | 
|  124   } |  130   } | 
|  125  |  131  | 
|  126   exec {"update_env": |  132   exec {"update_env": | 
|  127     command => "trac-admin /home/trac/environment upgrade", |  133     command => "trac-admin /home/trac/environment upgrade", | 
|  128     user => trac, |  134     user => trac, | 
|  129     require => [ |  135     require => [ | 
|  130       File['/home/trac/environment/conf/trac.ini'], |  136       File['/home/trac/environment/conf/trac.ini'], | 
|  131       Exec['install_SensitiveTickets'], |  137       Exec['install_SensitiveTickets'], | 
|  132       Exec['install_BlackMagicTicketTweaks'], |  138       Exec['install_BlackMagicTicketTweaks'], | 
|  133       Exec['install_AccountManager'], |  139       Exec['install_AccountManager'], | 
|  134       Exec['install_AutocompleteUsers'], |  140       Exec['install_AutocompleteUsers'], | 
|  135       Exec['install_TicketTemplate'], |  141       Exec['install_TicketTemplate'], | 
 |  142       Exec['install_NeverNotifyUpdater'], | 
|  136       Exec['install_MasterTickets']] |  143       Exec['install_MasterTickets']] | 
|  137   } |  144   } | 
|  138  |  145  | 
|  139   exec {"deploy": |  146   exec {"deploy": | 
|  140     command => "trac-admin /home/trac/environment deploy /home/trac/htdocs && fr
     omdos /home/trac/htdocs/cgi-bin/trac.fcgi && chmod 755 /home/trac/htdocs/cgi-bin
     /trac.fcgi", |  147     command => "trac-admin /home/trac/environment deploy /home/trac/htdocs && fr
     omdos /home/trac/htdocs/cgi-bin/trac.fcgi && chmod 755 /home/trac/htdocs/cgi-bin
     /trac.fcgi", | 
|  141     user => trac, |  148     user => trac, | 
|  142     require => [ |  149     require => [ | 
|  143       Exec["update_env"], |  150       Exec["update_env"], | 
|  144       Package["tofrodos"]] |  151       Package["tofrodos"]] | 
|  145   } |  152   } | 
|  146  |  153  | 
|  147   spawn-fcgi::pool {"tracd": |  154   spawn-fcgi::pool {"tracd": | 
|  148     ensure => present, |  155     ensure => present, | 
|  149     fcgi_app => "/home/trac/htdocs/cgi-bin/trac.fcgi", |  156     fcgi_app => "/home/trac/htdocs/cgi-bin/trac.fcgi", | 
|  150     socket => "/tmp/trac-fastcgi.sock", |  157     socket => "/tmp/trac-fastcgi.sock", | 
|  151     mode => "0666", |  158     mode => "0666", | 
|  152     user => trac, |  159     user => trac, | 
|  153     children => 1, |  160     children => 1, | 
|  154     require => Exec['deploy'], |  161     require => Exec['deploy'], | 
|  155   } |  162   } | 
|  156  |  163  | 
|  157   file {"/home/trac/permissions.csv": |  164   file {"/home/trac/permissions.csv": | 
|  158     ensure => present, |  165     ensure => present, | 
|  159     owner => trac, |  166     owner => trac, | 
|  160     source => 'puppet:///modules/trac/permissions.csv' |  167     source => 'puppet:///modules/trac/permissions.csv' | 
|  161   } |  168   } | 
|  162  |  169  | 
|  163 } |  170 } | 
| OLD | NEW |