View | Details | Raw Unified | Return to bug 208363 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +7 lines)
Lines 1-7 Link Here
1 
# $FreeBSD$
 1 
# $FreeBSD$
2 

          2
          

        

        

          3
          
PORTNAME=	puppetserver

          3
          
PORTNAME=	puppetserver

        

          
            

              4
              
PORTVERSION=	2.2.1


              4
              
PORTVERSION=	2.3.1

            

        

          5
          
CATEGORIES=	sysutils java

          5
          
CATEGORIES=	sysutils java

        

        

          6
          
MASTER_SITES=	http://downloads.puppetlabs.com/puppet/

          6
          
MASTER_SITES=	http://downloads.puppetlabs.com/puppet/

        

        

          7
          

          7
          

        

  

    
      
            Lines 59-64
          
      
      
        Link Here
      
    
  

        

          59
          

          59
          

        

        

          60
          
do-install:

          60
          
do-install:

        

        

          61
          
	${MKDIR} ${STAGEDIR}${DATADIR}

          61
          
	${MKDIR} ${STAGEDIR}${DATADIR}

        

            

              
              
              62
              
	${MKDIR} ${STAGEDIR}${DATADIR}/cli

            

            

              63
              
	${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps

            

        

          62
          
	${MKDIR} ${STAGEDIR}${ETCDIR}

          64
          
	${MKDIR} ${STAGEDIR}${ETCDIR}

        

        

          63
          
	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d

          65
          
	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d

        

        

          64
          
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code

          66
          
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code

        

  

    
      
            Lines 72-76
          
      
      
        Link Here
      
    
  

        

          72
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf

          74
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf

        

        

          73
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf

          75
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf

        

        

          74
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf

          76
          
	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf

        

            

              
              
              77
              
	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground

            

            

              78
              
	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem

            

            

              79
              
	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb

            

            

              80
              
	${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby

            

        

          75
          

          81
          

        

        

          76
          
.include <bsd.port.post.mk>

          82
          
.include <bsd.port.post.mk>

        



(-)distinfo
      (-2 / +2 lines)




  

    
      
            Lines 1-2
          
      
      
        Link Here
      
    
  

          
            

              1
              
SHA256 (puppetserver-2.2.1.tar.gz) = 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843


              1
              
SHA256 (puppetserver-2.3.1.tar.gz) = 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9

            

            

              2
              
SIZE (puppetserver-2.2.1.tar.gz) = 42665674


              2
              
SIZE (puppetserver-2.3.1.tar.gz) = 33667638

            



(-)files/patch-ext__config__conf.d__webserver.conf
      (-6 / +6 lines)




  

    
      
            Lines 1-9
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- ext/config/conf.d/webserver.conf.orig	2015-10-27 16:26:17 UTC


              1
              
--- ext/config/conf.d/webserver.conf.orig       2016-03-28 10:32:26.000000000 -0700

            

        

          2
          
+++ ext/config/conf.d/webserver.conf

          2
          
+++ ext/config/conf.d/webserver.conf

        

        

          3
          
@@ -1,5 +1,5 @@

          3
          
@@ -1,5 +1,5 @@

        

        

          4
          
 webserver: {

          4
          
 webserver: {

        

          
            

              5
              
-    access-log-config = /etc/puppetlabs/puppetserver/request-logging.xml


              5
              
-    access-log-config: /etc/puppetlabs/puppetserver/request-logging.xml

            

            

              6
              
+    access-log-config = %%PREFIX%%/etc/puppetserver/request-logging.xml


              6
              
+    access-log-config: %%PREFIX%%/etc/puppetserver/request-logging.xml

            

            

              7
              
     client-auth = want


              7
              
     client-auth: want

            

            

              8
              
     ssl-host = 0.0.0.0


              8
              
     ssl-host: 0.0.0.0

            

            

              9
              
     ssl-port = 8140


              9
              
     ssl-port: 8140

            



(-)pkg-plist
      (-8 / +12 lines)




  

    
      
            Lines 1-14
          
      
      
        Link Here
      
    
  

          
            

              1
              
%%ETCDIR%%/logback.xml


              1
              
@sample %%ETCDIR%%/logback.xml

            

            

              2
              
%%ETCDIR%%/bootstrap.cfg


              2
              
@sample %%ETCDIR%%/bootstrap.cfg

            

            

              3
              
%%ETCDIR%%/request-logging.xml


              3
              
@sample %%ETCDIR%%/request-logging.xml

            

            

              4
              
%%ETCDIR%%/conf.d/global.conf


              4
              
@sample %%ETCDIR%%/conf.d/auth.conf

            

            

              5
              
%%ETCDIR%%/conf.d/puppetserver.conf


              5
              
@sample %%ETCDIR%%/conf.d/global.conf

            

            

              6
              
%%ETCDIR%%/conf.d/web-routes.conf


              6
              
@sample %%ETCDIR%%/conf.d/puppetserver.conf

            

            

              7
              
%%ETCDIR%%/conf.d/webserver.conf


              7
              
@sample %%ETCDIR%%/conf.d/web-routes.conf

            

            

              8
              
%%ETCDIR%%/conf.d/auth.conf


              8
              
@sample %%ETCDIR%%/conf.d/webserver.conf

            

        

          9
          
%%DATADIR%%/puppetserver.jar

          9
          
%%DATADIR%%/puppetserver.jar

        

        

          10
          
@mode 0750

          10
          
@mode 0750

        

        

          11
          
@group puppet

          11
          
@group puppet

        

        

          12
          
@dir etc/puppet/code

          12
          
@dir etc/puppet/code

        

        

          13
          
@owner puppet

          13
          
@owner puppet

        

        

          14
          
@dir /var/log/puppetserver

          14
          
@dir /var/log/puppetserver

        

            

              
              
              15
              
%%DATADIR%%/cli/apps/foreground

            

            

              16
              
%%DATADIR%%/cli/apps/gem

            

            

              17
              
%%DATADIR%%/cli/apps/irb

            

            

              18
              
%%DATADIR%%/cli/apps/ruby

            






  

  Return to bug 208363