From 2863d853b6187117c45e0deb68b7d7abd455dd26 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 3 Feb 2012 14:40:08 +0000 Subject: [PATCH] Update for puppet installation Fixes this up to be used with puppet. DO NOT MERGE UNTIL SWITCHING TO PUPPET! Change-Id: I845726a6496660da90e3af03c5caf559f24e53a7 --- classic_fancy/index.html.tmplc | Bin 4030 -> 0 bytes common/rss10.xml.tmplc | Bin 1506 -> 0 bytes common/rss20.xml.tmplc | Bin 1510 -> 0 bytes planet.ini | 2 +- test.py | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 classic_fancy/index.html.tmplc delete mode 100644 common/rss10.xml.tmplc delete mode 100644 common/rss20.xml.tmplc diff --git a/classic_fancy/index.html.tmplc b/classic_fancy/index.html.tmplc deleted file mode 100644 index 9134e8b873e272b50b0e78939679eead5195b3ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4030 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 R7vCO02l4eu{*AMW@qaCI3>yFd diff --git a/common/rss10.xml.tmplc b/common/rss10.xml.tmplc deleted file mode 100644 index 688e67d77550439b7e218eb6561c69e1bbb423c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmZ`(*;dm)7%oeN1{86@U274oN;564)DXmlMIaz{@XC`DlELPXWcnvl(F-qqBQJao zk8k0nFW{f)fP)?{+SAN@+rKnbzb)cO#GS}!G5q!fGoX({|7RGe(lOWPaVLzJ+woE_ z&S0>*+P7N7PeDMD9&=+6#te=vEqwp_qf;mpkP#++)D2kgDubcVFieZ?E{Z^jPLno| z8EJQej3)f<3XBbjk@_Uj?6p}7D1X1y|R8&(?ZHn(0Z8YR3x8;{S|_fmQo$FG*Nb&a3x!co!Yu z1T9&u_02VRdtnR4=wK8kdvKBtF1Oa#VBDc2727CTA`}s`;gk+OO$QSXhkQnX&pPy^ zMS4i29du2J zmlf!`L#HgFiyCMW3KnNrQAw`A8wR!k6>9Wau(q+W36r$Al7rxeI23r2Sz4x0H3&p~Xs>p!97zViDP1seQ*m%}JCb`3R&t{#KbRqUK{82HZW8 zY5E{j4f*4;h$BNZ^(;hYsjDoFzeYHtL+{a1<>|^%-dCgt4lU5(UQ<>U;UO)`vBD#? z?{Ajju`V)8N93)GFNrXLrqXzlYhZPZi;TJhfp{*L{5yzJ>4;Qu+XH jz#BbfD^H1y$`=WjjvigQ?fiDs=UGy{nHJSs zhG*D5qzbEDt7-fu0!Wh{-40BfLeJ9NuOGi#i9`Y!rc<}V28~lb^d3Qmr1gCifh-wU znyyWiX4vpuM{!%!@dKlNs9+fz1D@}fCX3%}tH?S6iDdMz)bmZ(fxe~k-{aArn}3c; zuO7IE$b|k~I9DLEY8e?a2hQfFij(=WCaEZP8Z2Q@lO(m?G#rOonv_)oGq9)z10<`~ z);22o&fFFZl9Xehqg=I0a;g$T5Nnyvp$6wg=mnBuQ5Yhr<=R>WE>?-6DiM$o4Cf#; z4yZ;Q44(YKM1%Tu&uj(gNrOwG;ALL>3Ktx%l5TlIhN~jz8n1etgKk89ilUMPBSeZV zRo2%xV3ed+0*cGKiKYfs6Q2e9vZ#KG^z#Af(HQc)%IzvikW8$(vIuubI+_gJMaATd z4EIEl`=l?*>Uf$=2MSzcjA>+5C7LygJg6dhM40hGXf|Zi-=LmtRB*Dhd3Y%5j*}dN z=mG>LSOa+tiXu=UNwWcyyzUe;tuQ8Y9WSyZ!XNRGKIVicRkX?%2~P#v&q#0Gbpq-H zFpYHw&Mfn}C^~bBeZh6rsF99U!7Osx6Vcd2u*X)oH;?yFgR-djl4Kef)u&4(m_uNn zs+<5NcqO#?n)DlC&~!bW+J>1TM!c5~Q{e+#c69Q|dTUwK#HmPzf2J z_&Rd^(4%_Oqx-OfoMD-N)OJ!1JqypJGO@6?x^0GypgP@75k0R?6$+cDW z7y`RkG?SNu?=6b(&mvqGi!cCuL2xRsXc8Er+dbwD&t-glq0aUnU8U%bH&}KEN7a76 NsqAHnB9w-E#eWFw+};2H diff --git a/planet.ini b/planet.ini index 3832a01..63ac0d5 100644 --- a/planet.ini +++ b/planet.ini @@ -15,7 +15,7 @@ owner_name = Monty Taylor owner_email = mordred@inaugust.com output_theme = classic_fancy cache_directory = cache -output_dir = /srv/planet +output_dir = /srv/planet/openstack feed_timeout = 20 items_per_page = 60 log_level = DEBUG diff --git a/test.py b/test.py index 79e19d0..ec028ea 100644 --- a/test.py +++ b/test.py @@ -3,6 +3,6 @@ import ConfigParser cp = ConfigParser.ConfigParser() cp.read("planet.ini") -if cp.get('Planet', 'output_dir') != '/srv/planet': +if cp.get('Planet', 'output_dir') != '/srv/planet/openstack': sys.exit(1)