DELTA SVNPcPPx^ioF?{~R^E@n"Q]q7R%2$(3R'gXlb% cl'XuMaJpNtu:u.or=TEu P'ܽh9[Q]>~h:DH}"Ŵ*53á Q'sS|4? a"y:+y3K8=*o \ 8ϻ1B#UV&:LJIr~Bg]zi1Pfd=IVWK|:@.l.P{xcxf/[al苾vIONu^0IE6&*sZc!n "(}irm ̚3-/ 5&i+֦Y`Ha)vW~KԢ=b0laebP:4iNHwAQ(+.: iS83SQv4XH¿3?G88ŘEc+~[Up*t; }N)ncc̴.E!|dR{uesKO; +k1w!]I7\ eqǽC2"OpC1QQ13m I`wN 6g | 1IpoKUיܳ&3yK ϲ0EȹR\,A,u*4|YRgNbAH]6K"2AeO{H+5R]rENDREP DELTA SVNMOMM--- ext/cli_defaults/cli-defaults.sh.orig 2017-08-06 01:24:37.981353156 -0700 +++ ext/cli_defaults/cli-defaults.sh 2017-08-06 01:39:53.280636611 -0700 @@ -1,6 +1,6 @@ -INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" +INSTALL_DIR="%%DATADIR%%" -JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-1_7.jar}" +JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-9k.jar}" if [ ! -e "$JRUBY_JAR" ]; then echo "Unable to find specified JRUBY_JAR: ${JRUBY_JAR}" 1>&2 ENDREP DELTA SVN')''--- ext/config/conf.d/global.conf.orig 2017-08-02 20:34:12.049821329 -0700 +++ ext/config/conf.d/global.conf 2017-08-02 20:35:03.130347445 -0700 @@ -1,5 +1,5 @@ global: { # Path to logback logging configuration file; for more # info, see http://logback.qos.ch/manual/configuration.html - logging-config: /etc/puppetlabs/puppetserver/logback.xml + logging-config: %%PREFIX%%/etc/puppetserver/logback.xml } ENDREP DELTA SVNM~MMx^VmoH|B$_ /;*t^'{w-{7k7L1䋣gyfvlAd&6Aٔ%5v͙(-Fq8OQx>3ENx:Iq_bXggElNF!MߪY=  r&mԐ˔de^f2h^u~sn`yb%Ot ZAXYJJx0-xnW2@L?lOF^!9(W$j !Qӎ7"AZ3|ҀMSTe%6)V؏"׏ bTN۪u lt2;E vZ7&{dFi9G,__?|qdd0 NFa.ĭjK&2t!NPx"=(tn$gڈ Fxvf\ę!>C.k f%6ZoC7q\8ݩwд4t8mo_-YŸ].cx[cOYC&_BR; ~E>䍫3:H8[EIV46qoƔ[5rt2ѯG(gDzrzT=cvW3"z IM)Mc- ŷi1oޭO e)ENDREP DELTA SVNEx^n0S!*1@(n7Y/`P fӅV{Zj[ s|BOE+2lKPrO" Fb-;Q<@8FE>ËY0h:h02V+l,}R׬L&tG TdUBʉRn{߄ک̓ʼ3pAˏPPŞS-HRAҝLG"_kN[*&<~sF^G*{C~0^{xO첢ED1z;4p֭g9e&ٖ;!Z3Y2tFhA ۷=Q }_zˁ4ϏJCf=jcCQ]H3kbf{>A MyZ$;xf9HO=xENDREP DELTA SVNprppRemember to run: sysrc puppetserver_enable=yes A note to users upgrading to 2.6 who have also modified bootstrap.cfg, please see the release notes for breaking changes in 2.5. https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25 The file bootstrap.cfg has been removed and ca configuration has been moved out to its own file in ca.cfg. ENDREP DELTA SVN\D\\x^UasF~b#CN!3)) )ݦs-Իc޽’[>}iUk-$d.ϻo T$Mw\AȷM^I5;oΑ>q?@}PAƗzx>BW GhesQT{Ll"T"ŵ⅂[9f-"R4es/2HS ZO`GHW%EAU+Ia_H& 0SML:qAR#Ԃj4ZwT<[kj#ȅC]mY3IHL#sl %{5#NH(?lX! UMHϬ@V9&j6LߛMVvO: x Rђ:]4{/=$K!8;Bvc@zsG"v-E{ _$R| "2"3(e yk|8\ѕ<7nu#ك8&܋(޵n^Δ7>[; R: $֬UK9M$}ۢB:֏{b +PP ΦѨXޙgahf|\P8̝֔N<ΩUe W~|C(r`W4mZ_楐WEʖ;ĖxV@fnݺƳq{7pj~ݶ bG+sv]TblӗI,88,Vr.]tG:!6zgp^U/[Uqcٱް<{OGNZAC1HDc -D}}C>Pdcki )oÅdH*o/ kpVU~:YtW]&6{^ί4sƺIXh *ud(A}AhMW7B43[@u2