Merge lp:pplivesite into lp:~wester/pplivesite/infalls

[Torbjörn Wester]

test

[Torbjörn Wester (wester)]

review: Approve

Unmerged revisions

609. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-07

sourceid

608. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-04

sourceid

607. By www-data <www-data@pplive> on 2012-05-03

bloglinks

606. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

bloglinks

605. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

bloglinks

604. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

frekar, ershag

603. By www-data <www-data@pplive> on 2012-05-03

Breddning

602. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-08

Hax24

601. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-08

Hax24

600. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-07

Holm och 5101

=== modified file 'config/live'
--- config/live	2011-03-18 08:05:06 +0000
+++ config/live	2011-05-09 19:32:09 +0000
@@ -207,23 +207,23 @@
 
 
 
-# Har försökt fråga via marcin, men inte hört något.
-[http://blog.brokep.com/category/piracy/feed/]
-name = Copy me happy
-face = brokep.png
-sourceid = brokep
-
-[http://blog.brokep.com/category/big-brother/feed/]
-name = Copy me happy
-face = brokep.png
-suppress = True
-sourceid = brokep
-
-[http://blog.brokep.com/category/the-trial/feed/]
-name = Copy me happy
-face = brokep.png
-suppress = True
-sourceid = brokep
+# XXX Har försökt fråga via marcin, men inte hört något.
+#[http://blog.brokep.com/category/piracy/feed/]
+#name = Copy me happy
+#face = brokep.png
+#sourceid = brokep
+
+#[http://blog.brokep.com/category/big-brother/feed/]
+#name = Copy me happy
+#face = brokep.png
+#suppress = True
+#sourceid = brokep
+
+#[http://blog.brokep.com/category/the-trial/feed/]
+#name = Copy me happy
+#face = brokep.png
+#suppress = True
+#sourceid = brokep
 
 
 
@@ -328,7 +328,7 @@
 suppress = True
 sourceid = mini
 
-# denna innehåller bara blogginlägg nu...
+# XXX denna innehåller bara blogginlägg nu...
 #[http://www.piratpartiet.se/node/feed]
 #name = Piratpartiet Nyheter
 #pirat = True
@@ -389,11 +389,12 @@
 face = pp.png
 sourceid = syd
 
-[http://nord.piratpartiet.se/feed/]
-name = Piratpartiet Norra distriktet
+[http://sodertalje.piratpartiet.se/feed/]
+name = Piratpartiet Södertälje
 pirat = True
 face = pp.png
-sourceid = nord
+sourceid = sodertalje
+
 
 
 
@@ -467,9 +468,6 @@
 sourceid = piratpartisten
 face = piratpartisten.png
 
-# Inte längre aktuell
-# [http://nyheter24.se/nyheter/blogg/oscar-swartz/?service=rss]
-# name = Nyheter24: Oscar Swartz
 
 
 [http://ppdrift.wordpress.com/category/live/feed/]
@@ -482,7 +480,7 @@
 
 
 # Kalle ville ha "Pirate" 
-# Har flyttat till I2P ....
+# XXX Har flyttat till I2P ....
 #[http://xorbot.org/txt-category/pirate/feed]
 #name = XORBOT
 #pirat = True
@@ -519,15 +517,6 @@
 
 
 
-# TODO, har inte fått svar 
-[http://jacobdexe.wordpress.com/feed/]
-name = Jacob Dexe
-pirat = True
-face = dexe.png
-sourceid = dexe
-
-
-
 # Piratfrågor enligt Simon
 [http://stenskott.wordpress.com/category/piratfragor/feed/]
 name = Stenskott
@@ -575,6 +564,7 @@
 # TODO inte kollat
 [http://blog.erlandsson.info/category/piratpartiet/feed/]
 name = Leo Erlandsson
+link = http://blog.erlandsson.info/
 pirat = True
 face = leo.png
 sourceid = leo
@@ -668,7 +658,6 @@
 # Josh vill ha "pirat"
 [http://scriptorium.se/josh/category/pirat/feed/]
 name = Enligt min humla
-pirat = True
 face = enligtminhumla.png
 sourceid = joshen
 detect_encoding = False
@@ -742,7 +731,7 @@
 
 
 # Thomas ville detta
-# Siten är nere
+# XXX Siten är nere
 #[http://www.selig.se/tag/Piratpartiet/feed/]
 #name = Selig.se
 #pirat = True
@@ -767,7 +756,7 @@
 
 
 # allt ville johan ha
-[http://piratpartist.wordpress.com/feed/]
+[http://piratpartist.nu/?feed=rss2]
 name = Piratpartistens Blogg
 pirat = True
 face = piratpartist.png
@@ -910,11 +899,13 @@
 sourceid = erikj
 
 
-[http://paranoianormal.se/blog/tag/piratpartiet/feed/]
-name = Paranoianormal
-pirat = True
-face = paranoianormal.png
-sourceid = paranoianormal
+# XXX nere
+#[http://paranoianormal.se/blog/tag/piratpartiet/feed/]
+#name = Paranoianormal
+#link = http://paranoianormal.se/blog/
+#pirat = True
+#face = paranoianormal.png
+#sourceid = paranoianormal
 
 
 [http://farmorgun.blogspot.com/feeds/posts/default/-/PP?alt=rss]
@@ -955,14 +946,6 @@
 
 
 
-# Tobias ville ha "politik"
-[http://tobias.funderar.se/tag/politik/feed/]
-name = En objektiv sanning
-pirat = True
-face = objektivsanning.png
-sourceid = objektivsanning
-
-
 # Ville ha Live
 [http://www.piratplatsen.se/?q=taxonomy/term/1/all/feed]
 name = Piratplatsen
@@ -1018,7 +1001,6 @@
 # Olof ville ha informationspolitik
 [http://olofb.wordpress.com/tag/informationspolitik/feed/]
 name = OlofB[eta]
-pirat = True
 face = olofb.png
 sourceid = olofb
 
@@ -1035,7 +1017,7 @@
 
 # Nipe ville ha "piratpartiet"
 [http://gustavnipe.wordpress.com/category/piratpartiet/feed/]
-name = I polemik
+name = Förbundsordföranden
 pirat = True
 face = gustavnipe.png
 sourceid = gustavnipe
@@ -1059,6 +1041,7 @@
 # Bara Övervakningssamhället, **eget filter**
 [http://scabernestor.blogg.se/index.rss]
 name = Scaber Nestor
+annatparti = l
 filters = scaber_nestor_categories.py
 face = scabernestor.png
 sourceid = scabernestor
@@ -1828,6 +1811,7 @@
 # Dolkow ville ha "piratpartiet"
 [http://dolkow.se/blog/post.php/category/piratpartiet/feed/]
 name = Snilds korta
+link = http://dolkow.se/blog/
 pirat = True
 face = dolkow.png
 sourceid = dolkow
@@ -1956,6 +1940,7 @@
 # Sandra ville ha "piratpartiet"
 [http://www.sandrability.com/taggar/piratpartiet/feed/]
 name = Sandrability.com
+link = http://www.sandrability.com/
 pirat = True
 face = sandrability.png
 sourceid = sandrability
@@ -2021,6 +2006,7 @@
 sourceid = grodornakokar
 
 
+# XXX invite only
 # Eva ville Piratpartiet, integritet, patent och immaterialrätt.
 #[http://generalklausul.blogspot.com/feeds/posts/default/-/piratpartiet?alt=rss]
 #name = Hundratusentals Ögonblick
@@ -2157,13 +2143,6 @@
 detect_encoding = False
 
 
-[http://tjejsnack.piratpartiet.se/feed/]
-name = Tjejsnack
-pirat = True
-face = tjejsnack.png
-sourceid = tjejsnack
-
-
 # Björn ville ha "pp" och "pirat"
 [http://bjornodlund.wordpress.com/tag/pp/feed/]
 name = Björn Odlund
@@ -2202,26 +2181,20 @@
 suppress = True
 
 
-# Victoria ville ha Ung Pirat, Piratpartiet, och Piratrörelsen.
-[http://borgmi.wordpress.com/tag/ung-pirat/feed/]
-name = Borgmi
-pirat = True
-face = borgmi.png
-sourceid = borgmi
-
-[http://borgmi.wordpress.com/tag/piratpartiet/feed/]
-name = Borgmi
-pirat = True
-face = borgmi.png
-sourceid = borgmi
-suppress = True
-
-[http://borgmi.wordpress.com/tag/piratrorelsen/feed/]
-name = Borgmi
-pirat = True
-face = borgmi.png
-sourceid = borgmi
-suppress = True
+# Victoria ville ha Ung Pirat, Piratpartiet.
+[http://victoriawestberg.se/tag/ung-pirat/feed/]
+name = Victoria Westberg
+pirat = True
+face = victoriawestberg.png
+sourceid = victoriawestberg
+
+[http://victoriawestberg.se/tag/piratpartiet/feed/]
+name = Victoria Westberg
+pirat = True
+face = victoriawestberg.png
+sourceid = victoriawestberg
+suppress = True
+
 
 
 #Ville ha "piratpartiet"
@@ -2292,12 +2265,13 @@
 suppress = True
 
 
+# XXX nere
 # Ville ha "live"
-[http://www.piratus.se/?tag=live&feed=rss2]
-name = Piratus
-pirat = True
-face = piratus.png
-sourceid = piratus
+#[http://www.piratus.se/?tag=live&feed=rss2]
+#name = Piratus
+#pirat = True
+#face = piratus.png
+#sourceid = piratus
 
 
 # ville ha piratpartiet
@@ -2486,20 +2460,13 @@
 # Filtrera på fritext "Nunc aut nuncuam" **eget filter**
 [http://blogg.aftonbladet.se/feeds/entries/21909/rss]
 name = Svensk Myndighetskontroll
+annatparti = l
 filters = svensk_myndighetskontroll_categories.py
 face = svensk_myndighetskontroll.png
 link = http://blogg.aftonbladet.se/21909
 sourceid = svensk_myndighetskontroll
 
 
-[http://www.piratnytt.nu/index.php?format=feed&type=rss]
-name = Piratnytt
-pirat = True
-link = http://www.piratnytt.nu/
-face = piratnytt.png
-sourceid = piratnytt
-
-
 
 # Hela relevant
 [http://acta.mpbloggar.se/feed/]
@@ -2528,13 +2495,6 @@
 
 
 
-# pplive
-[http://www.meastro.se/?cat=58&feed=rss2]
-name = Maestro.se
-pirat = True 
-face = maestro.png
-sourceid = maestro
-
 
 # 
 [http://jonasnordgren.se/?cat=3&feed=rss2]
@@ -2588,18 +2548,18 @@
 
 
 
-
+# XXX nere
 # Propiratism
-[http://nordicbattlegroup.org/?cat=4&feed=rss2]
-name = Nördic Battlegroup – Ad Omnia Piratus
-pirat = True
-face = nordicbattlegroup.png
-sourceid = nordicbattlegroup
-
-
-
-
-# ville ha PP lokalt, PP internt och Politik
+#[http://nordicbattlegroup.org/?cat=4&feed=rss2]
+#name = Nördic Battlegroup – Ad Omnia Piratus
+#pirat = True
+#face = nordicbattlegroup.png
+#sourceid = nordicbattlegroup
+
+
+
+
+# ville ha PP lokalt, PP internt, Ung pirat och Politik
 [http://jppirat.blogspot.com/feeds/posts/default/-/PP%20lokalt?alt=rss]
 name = värmlandspiraten
 pirat = True
@@ -2615,6 +2575,14 @@
 sourceid = jppirat
 suppress = True
 
+[http://jppirat.blogspot.com/feeds/posts/default/-/Ung%20Pirat?alt=rss]
+name = värmlandspiraten
+pirat = True
+link = http://jppirat.blogspot.com/
+face = jppirat.png
+sourceid = jppirat
+suppress = True
+
 [http://jppirat.blogspot.com/feeds/posts/default/-/Politik?alt=rss]
 name = värmlandspiraten
 pirat = True
@@ -2721,7 +2689,7 @@
 sourceid = ruhovi
 
 
-# Aktivism!
+# XXX Aktivism!
 #[http://data.piratpartiet.se/Rss/Activism.aspx?OrganizationId=1]
 #name = Piratpartiet aktivism!
 #pirat = True
@@ -2775,28 +2743,6 @@
 sourceid = anonwret
 
 
-# "piratrelaterat", "ung pirat" och taggen "piratpartiet"
-[http://olofnoaksson.wordpress.com/category/piratrelaterat/feed/]
-name = Olof Noaksson's Blogg 
-pirat = True
-face = olofnoaksson.png
-sourceid = olofnoaksson
-
-[http://olofnoaksson.wordpress.com/category/ung-pirat/feed/]
-name = Olof Noaksson's Blogg 
-pirat = True
-face = olofnoaksson.png
-sourceid = olofnoaksson
-suppress = True
-
-[http://olofnoaksson.wordpress.com/tag/piratpartiet/feed/]
-name = Olof Noaksson's Blogg 
-pirat = True
-face = olofnoaksson.png
-sourceid = olofnoaksson
-suppress = True
-
-
 
 # Piratpartiet och Piratfrågor
 [http://hansblogg.wordpress.com/category/piratfragor/feed/]
@@ -2886,6 +2832,7 @@
 name = [insert random stupid name here]
 face = jamtsved.png
 sourceid = jamtsved
+suppress = True
 
 
 
@@ -2907,13 +2854,14 @@
 sourceid = hell-man
 
 
+# XXX nere
 # "pirat"
-[http://www.fredrikhallund.com/?tag=integritet&feed=rss2]
-pirat = True
-link = http://www.fredrikhallund.com/
-name = På djupa vatten
-face = djupavatten.png
-sourceid = djupavatten
+#[http://www.fredrikhallund.com/?tag=integritet&feed=rss2]
+#pirat = True
+#link = http://www.fredrikhallund.com/
+#name = På djupa vatten
+#face = djupavatten.png
+#sourceid = djupavatten
 
 
 # "piratpartiet"
@@ -2960,3 +2908,67 @@
 sourceid = ekferjan
 
 
+[http://cmagnusb.wordpress.com/tag/pplive/feed/]
+pirat = True
+link = http://cmagnusb.wordpress.com/
+name = Det är en bra dag idag!
+face = cmagnusb.png
+sourceid = cmagnusb
+
+
+
+[http://ppnow.blog.com/feed/]
+pirat = True
+name = Strategies for the Pirate Movement
+face = ppnow.png
+sourceid = ppnow
+
+
+[http://anton.nordenfur.se/tag/piratpartiet/feed/]
+pirat = True
+name = Anton Nordenfur
+link = http://anton.nordenfur.se/
+face = nordenfur.png
+sourceid = nordenfur
+
+
+[http://simonlindgren.se/?category_name=piratpartiet&feed=rss2]
+pirat = True
+name = Simon Lindgren
+link = http://simonlindgren.se/
+face = simonlindgren.png
+sourceid = simonlindgren
+
+
+[http://fildelning.se/feed/]
+link = http://fildelning.se/
+name = Fildelning
+face = fildelning.png
+sourceid = fildelning
+
+
+# Sandra ville ha "Politik"
+[http://terobi.se/category/politik/feed/]
+name = terobi
+pirat = True
+face = terobi.png
+link = http://terobi.se/
+sourceid = terobi
+
+
+# Dexe ville ha "live"
+[http://dexe.nu/tag/live/feed/]
+name = Jacob Dexe
+face = dexe.png
+sourceid = dexe
+link = http://dexe.nu/
+
+
+[http://svpol.se/tag/pplive/feed/]
+name = #svpol
+face = svpol.png
+sourceid = svpol
+link = http://svpol.se/
+
+
+

=== modified file 'run.sh'
--- run.sh	2011-01-14 11:41:18 +0000
+++ run.sh	2011-05-09 19:32:09 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+if [ "$(whoami)" = "root" ]; then echo "Fuck off."; exit; fi
+
 PLANET=venus/planet.py
 CONFIGS="highlight live" 
 

=== added file 'www/images/faces/cmagnusb.png'
Binary files www/images/faces/cmagnusb.png	1970-01-01 00:00:00 +0000 and www/images/faces/cmagnusb.png	2011-05-09 19:32:09 +0000 differ
=== modified file 'www/images/faces/dexe.png'
Binary files www/images/faces/dexe.png	2011-01-14 11:41:18 +0000 and www/images/faces/dexe.png	2011-05-09 19:32:09 +0000 differ
=== added file 'www/images/faces/fildelning.png'
Binary files www/images/faces/fildelning.png	1970-01-01 00:00:00 +0000 and www/images/faces/fildelning.png	2011-05-09 19:32:09 +0000 differ
=== removed file 'www/images/faces/maestro.png'
Binary files www/images/faces/maestro.png	2011-01-14 11:41:18 +0000 and www/images/faces/maestro.png	1970-01-01 00:00:00 +0000 differ
=== added file 'www/images/faces/nordenfur.png'
Binary files www/images/faces/nordenfur.png	1970-01-01 00:00:00 +0000 and www/images/faces/nordenfur.png	2011-05-09 19:32:09 +0000 differ
=== removed file 'www/images/faces/objektivsanning.png'
Binary files www/images/faces/objektivsanning.png	2011-01-14 11:41:18 +0000 and www/images/faces/objektivsanning.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'www/images/faces/olofnoaksson.png'
Binary files www/images/faces/olofnoaksson.png	2011-01-14 11:41:18 +0000 and www/images/faces/olofnoaksson.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'www/images/faces/piratjonas.png'
Binary files www/images/faces/piratjonas.png	2011-01-14 11:41:18 +0000 and www/images/faces/piratjonas.png	2011-05-09 19:32:09 +0000 differ
=== removed file 'www/images/faces/piratnytt.png'
Binary files www/images/faces/piratnytt.png	2011-01-14 11:41:18 +0000 and www/images/faces/piratnytt.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'www/images/faces/piratplatsen.png'
Binary files www/images/faces/piratplatsen.png	2011-01-14 11:41:18 +0000 and www/images/faces/piratplatsen.png	2011-05-09 19:32:09 +0000 differ
=== added file 'www/images/faces/ppnow.png'
Binary files www/images/faces/ppnow.png	1970-01-01 00:00:00 +0000 and www/images/faces/ppnow.png	2011-05-09 19:32:09 +0000 differ
=== added file 'www/images/faces/simonlindgren.png'
Binary files www/images/faces/simonlindgren.png	1970-01-01 00:00:00 +0000 and www/images/faces/simonlindgren.png	2011-05-09 19:32:09 +0000 differ
=== added file 'www/images/faces/svpol.png'
Binary files www/images/faces/svpol.png	1970-01-01 00:00:00 +0000 and www/images/faces/svpol.png	2011-05-09 19:32:09 +0000 differ
=== removed file 'www/images/faces/tjejsnack.png'
Binary files www/images/faces/tjejsnack.png	2011-01-14 11:41:18 +0000 and www/images/faces/tjejsnack.png	1970-01-01 00:00:00 +0000 differ
=== renamed file 'www/images/faces/borgmi.png' => 'www/images/faces/victoriawestberg.png'