← Back to branch summary

~ubuntu-branches/ubuntu/lucid/puppet/lucid-security

« back to all changes in this revision

Viewing changes to conf/solaris/smf/puppetmasterd.xml

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conf/solaris/smf/puppetmasterd.xml
7
7
 
8
8
 
9
9
<service
10
 
        name='network/puppetmasterd'
11
 
        type='service'
12
 
        version='1'>
13
 
 
14
 
        <create_default_instance enabled='true'/>
15
 
        <single_instance/>
16
 
 
17
 
        <dependency name='config-file'
18
 
                    grouping='require_all'
19
 
                    restart_on='none'
20
 
                    type='path'>
21
 
                <service_fmri value='file:///etc/puppet/puppet.conf'/>
22
 
        </dependency>
23
 
        
24
 
        <dependency name='loopback'
25
 
                    grouping='require_all'
26
 
                    restart_on='error'
27
 
                    type='service'>
28
 
                <service_fmri value='svc:/network/loopback:default'/>
29
 
        </dependency>
30
 
 
31
 
        <dependency name='physical'
32
 
                    grouping='require_all'
33
 
                    restart_on='error'
34
 
                    type='service'>
35
 
                <service_fmri value='svc:/network/physical:default'/>
36
 
        </dependency>
37
 
 
38
 
        <dependency name='fs-local'
39
 
                    grouping='require_all'
40
 
                    restart_on='none'
41
 
                    type='service'>
42
 
                <service_fmri value='svc:/system/filesystem/local'/>
43
 
        </dependency>
44
 
 
45
 
        <exec_method
46
 
                type='method'
47
 
                name='start'
 
10
    name='network/puppetmasterd'
 
11
    type='service'
 
12
    version='1'>
 
13
 
 
14
    <create_default_instance enabled='true'/>
 
15
    <single_instance/>
 
16
 
 
17
    <dependency name='config-file'
 
18
                grouping='require_all'
 
19
                restart_on='none'
 
20
                type='path'>
 
21
        <service_fmri value='file:///etc/puppet/puppet.conf'/>
 
22
    </dependency>
 
23
 
 
24
    <dependency name='loopback'
 
25
                grouping='require_all'
 
26
                restart_on='error'
 
27
                type='service'>
 
28
        <service_fmri value='svc:/network/loopback:default'/>
 
29
    </dependency>
 
30
 
 
31
    <dependency name='physical'
 
32
                grouping='require_all'
 
33
                restart_on='error'
 
34
                type='service'>
 
35
        <service_fmri value='svc:/network/physical:default'/>
 
36
    </dependency>
 
37
 
 
38
    <dependency name='fs-local'
 
39
                grouping='require_all'
 
40
                restart_on='none'
 
41
                type='service'>
 
42
        <service_fmri value='svc:/system/filesystem/local'/>
 
43
    </dependency>
 
44
 
 
45
    <exec_method
 
46
        type='method'
 
47
        name='start'
48
48
        exec='/opt/csw/lib/svc/method/svc-puppetmasterd start'
49
 
                timeout_seconds='60' />
 
49
        timeout_seconds='60' />
50
50
 
51
 
        <exec_method
52
 
                type='method'
53
 
                name='stop'
 
51
    <exec_method
 
52
        type='method'
 
53
        name='stop'
54
54
        exec='/opt/csw/lib/svc/method/svc-puppetmasterd stop'
55
 
                timeout_seconds='60' />
 
55
        timeout_seconds='60' />
56
56
 
57
 
        <exec_method
58
 
                type='method'
59
 
                name='refresh'
 
57
    <exec_method
 
58
        type='method'
 
59
        name='refresh'
60
60
        exec='/opt/csw/lib/svc/method/svc-puppetmasterd reload'
61
 
                timeout_seconds='60' />
62
 
 
63
 
        <stability value='Unstable' />
64
 
 
65
 
        <template>
66
 
                <common_name>
67
 
                        <loctext xml:lang='C'>Puppet Server Daemon</loctext>
68
 
                </common_name>
69
 
                <documentation>
70
 
                        <manpage title='puppetmasterd' section='1' />
71
 
                        <doc_link name='reductivelabs.com'
72
 
                                uri='http://www.reductivelabs.com/projects/puppet' />
73
 
                </documentation>
74
 
        </template>
 
61
        timeout_seconds='60' />
 
62
 
 
63
    <stability value='Unstable' />
 
64
 
 
65
    <template>
 
66
        <common_name>
 
67
            <loctext xml:lang='C'>Puppet Server Daemon</loctext>
 
68
        </common_name>
 
69
        <documentation>
 
70
            <manpage title='puppetmasterd' section='1' />
 
71
            <doc_link name='reductivelabs.com'
 
72
                uri='http://www.reductivelabs.com/projects/puppet' />
 
73
        </documentation>
 
74
    </template>
75
75
</service>
76
76
 
77
77
</service_bundle>