Merge branch 'master' of git+ssh://git.gentoo.org/sites/planet

14 files changed, 4 insertions, 54 deletions

diff --git a/configs/planet/dabbott b/configs/planet/dabbott
deleted file mode 100644
index 74b1d1c..0000000
--- a/configs/planet/dabbott
+++ /dev/null
@@ -1,9 +0,0 @@
-# David uses two blogs, one for linuxcrazy podcasts and one for personal gentoo-related posts
-[http://linuxcrazy.com/?q=rss.xml]
-name = LinuxCrazy Podcasts
-username = linuxcrazy
-gravatar = 722cf64173da3dcd4fc1b312aeeee73d
-[http://gentoo-pr.org/rss.xml]
-name = David Abbott
-username = dabbott
-gravatar = b1df0aa2a48a2cc8fe1124637ad2bbfa
diff --git a/configs/planet/gurligebis b/configs/planet/gurligebis
deleted file mode 100644
index 9174a9f..0000000
--- a/configs/planet/gurligebis
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.gurlinet.dk/category/gentoo/feed/atom/]
-name = Bjarke Istrup Pedersen
-username = gurligebis
-gravatar = 1dcdf2090dfb72a6fff5ecf0b4b00283
diff --git a/configs/planet/ken69267 b/configs/planet/ken69267
deleted file mode 100644
index 4fb91af..0000000
--- a/configs/planet/ken69267
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://ken.ath.cx/kens_code_pit/category/gentoo/feed/]
-name = Kenneth Prugh
-username = ken69267
-gravatar = ff8a7eb238840bf030a98eae236a88b2
diff --git a/configs/planet/keytoaster b/configs/planet/keytoaster
deleted file mode 100644
index 58d30cd..0000000
--- a/configs/planet/keytoaster
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.vandium.net/category/gentoo-org/feed/]
-username = keytoaster
-name = Tobias Heinlein
-gravatar = 8a88ff58b8ef996582d67a54d721415f
diff --git a/configs/planet/klausman b/configs/planet/klausman
deleted file mode 100644
index bb9dfb5..0000000
--- a/configs/planet/klausman
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.i-no.de/rss.xml]
-name = Tobias Klausmann
-username = klausman
-gravatar = d504c1fd005983d1f59cea4a007d48cc
diff --git a/configs/planet/rafaelmartins b/configs/planet/rafaelmartins
index f98e287..fd841a6 100644
--- a/configs/planet/rafaelmartins
+++ b/configs/planet/rafaelmartins
@@ -1,4 +1,4 @@
-[https://rgm.io/atom/gentoo/]
+[http://feeds.rgm.io/rafaelmartins-gentoo.xml]
 username = rafaelmartins
 name = Rafael G. Martins
 gravatar = d9ac8d426c34c0b556b5ce4de3d3df23
diff --git a/configs/planet/thev00d00 b/configs/planet/thev00d00
index cc069dc..f45fd43 100644
--- a/configs/planet/thev00d00
+++ b/configs/planet/thev00d00
@@ -1,4 +1,4 @@
-[http://v00d00.net/category/linux/gentoo-linux/feed]
+[http://v00d00.net/tag/gentoo/rss/]
 username = thev00d00
 name = Ian Whyman
 gravatar = 8c9d66ff69aeba9d9df3797f0b295029
diff --git a/configs/universe/dabbott b/configs/universe/dabbott
deleted file mode 100644
index 74b1d1c..0000000
--- a/configs/universe/dabbott
+++ /dev/null
@@ -1,9 +0,0 @@
-# David uses two blogs, one for linuxcrazy podcasts and one for personal gentoo-related posts
-[http://linuxcrazy.com/?q=rss.xml]
-name = LinuxCrazy Podcasts
-username = linuxcrazy
-gravatar = 722cf64173da3dcd4fc1b312aeeee73d
-[http://gentoo-pr.org/rss.xml]
-name = David Abbott
-username = dabbott
-gravatar = b1df0aa2a48a2cc8fe1124637ad2bbfa
diff --git a/configs/universe/gurligebis b/configs/universe/gurligebis
deleted file mode 100644
index 2aa48d3..0000000
--- a/configs/universe/gurligebis
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.gurlinet.dk/feed/atom/]
-name = Bjarke Istrup Pedersen
-username = gurligebis
-gravatar = 1dcdf2090dfb72a6fff5ecf0b4b00283
diff --git a/configs/universe/ken69267 b/configs/universe/ken69267
deleted file mode 100644
index 4d73ff6..0000000
--- a/configs/universe/ken69267
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://ken.ath.cx/kens_code_pit/feed/atom/]
-name = Kenneth Prugh
-username = ken69267
-gravatar = ff8a7eb238840bf030a98eae236a88b2
diff --git a/configs/universe/keytoaster b/configs/universe/keytoaster
deleted file mode 100644
index 6e23f6d..0000000
--- a/configs/universe/keytoaster
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.vandium.net/category/gentoo-org-universe/feed/]
-username = keytoaster
-name = Tobias Heinlein
-gravatar = 8a88ff58b8ef996582d67a54d721415f
diff --git a/configs/universe/klausman b/configs/universe/klausman
deleted file mode 100644
index bb9dfb5..0000000
--- a/configs/universe/klausman
+++ /dev/null
@@ -1,4 +0,0 @@
-[http://blog.i-no.de/rss.xml]
-name = Tobias Klausmann
-username = klausman
-gravatar = d504c1fd005983d1f59cea4a007d48cc
diff --git a/configs/universe/rafaelmartins b/configs/universe/rafaelmartins
index 59e9273..df8c924 100644
--- a/configs/universe/rafaelmartins
+++ b/configs/universe/rafaelmartins
@@ -1,4 +1,4 @@
-[https://rgm.io/atom/]
+[http://feeds.rgm.io/rafaelmartins.xml]
 username = rafaelmartins
 name = Rafael G. Martins
 gravatar = d9ac8d426c34c0b556b5ce4de3d3df23
diff --git a/scripts/update-venus b/scripts/update-venus
index 46a1494..faa7f4e 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -34,7 +34,7 @@ for instance in planet universe; do
     # Generate the combined ini file from the split config files
     cat ${REPO}/configs/base/venus.${instance} ${REPO}/configs/${instance}/* > ${BASE_DIR}/generated_configs/venus.${instance}.ini
     # Run venus
-    python ${VENUS_DIR}/planet.py -v ${BASE_DIR}/generated_configs/venus.${instance}.ini > ${LOG_DIR}/${instance}/${LOG_DATE}.log 2>&1
+    python2 ${VENUS_DIR}/planet.py -v ${BASE_DIR}/generated_configs/venus.${instance}.ini > ${LOG_DIR}/${instance}/${LOG_DATE}.log 2>&1
 done
 
 # Delete old logs