Read misc files from environment

diff --git a/modules/debian_org/files/misc/hoster.yaml b/modules/debian_org/files/misc/hoster.yaml
new file mode 100644 (file)
index 0000000..3028f68
--- /dev/null
+++ b/modules/debian_org/files/misc/hoster.yaml
@@ -0,0 +1,169 @@
+---
+1und1-sec:
+  netrange:
+    - 195.20.242.64/26
+    - 212.227.126.32/27
+    - 2001:8d8:2:1::/64
+accumu:
+  netrange:
+    - 130.239.0.0/16
+    - 130.242.6.0/24
+    - 2001:6b0:e::/48
+    - 2001:6b0:19::/48
+aql:
+  netrange:
+    - 141.170.6.144/28
+  mirror-debian: http://ftp.uk.debian.org/debian/
+arm:
+  netrange:
+    - 217.140.96.0/22
+  entropy_provider_hoster: sil
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
+brown:
+  netrange:
+    - 138.16.160.0/24
+  # all hosts have their own recursor
+  #mirror-debian: file:///srv/ftp-master.debian.org/mirror/ftp-master/
+  mirror-debian: http://ftp.us.debian.org/debian
+br:
+  # rename to c3sl
+  # University Federal do Parana (.br)
+  netrange:
+    - 200.17.192.0/19
+bytemark:
+  netrange:
+    - 5.153.231.0/24
+    - 89.16.160.112/29
+    - 2001:41c8:1000::/48
+    - 2001:41c8:61::/125
+  mirror-debian: http://mirror.bm.debian.org/debian
+carnet:
+  netrange:
+    - 193.198.0.0/16
+anu:
+  netrange:
+    - 150.203.164.0/24
+    - 2001:388:1034:2900::/64
+  #mirror-debian: http://mirror.linux.org.au/debian
+  #mirror-debian: http://ftp.au.debian.org/debian
+conova:
+  netrange:
+    - 217.196.149.224/28
+  mirror-debian: http://mirror.netcologne.de/debian/
+csail:
+  netrange:
+    - 128.31.0.0/24
+  mirror-debian: http://debian.csail.mit.edu/debian/
+dgi:
+  netrange:
+    - 93.94.130.128/26
+freenet:
+  netrange:
+    - 62.104.0.0/16
+gatech:
+  netrange:
+    - 128.61.240.0/23
+  mirror-debian: http://debian.gtisc.gatech.edu/debian/
+grnet:
+  netrange:
+    - 194.177.211.192/27
+    - 2001:648:2ffc:deb::/64
+  mirror-debian: http://ftp.gr.debian.org/debian/
+helsinki:
+  netrange:
+    - 193.167.160.0/23
+  # all hosts have their own recursor
+isc:
+  netrange:
+    - 149.20.0.0/16
+    - 2001:4F8::/32
+uni-karlsruhe:
+  # rename to karlsruhe
+  netrange:
+    - 129.143.160.0/29
+    - 2001:7c0:400:1337::/64
+  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
+linaro:
+  netrange:
+    - 64.28.108.83/32
+    - 64.28.108.84/32
+    - 64.28.108.85/32
+  mirror-debian: http://ftp.us.debian.org/debian/
+'man-da':
+  netrange:
+    - 82.195.75.64/26
+    - 2001:41b8:202:deb::/64
+  #mirror-debian: http://debian.netcologne.de/debian/ [currently unstable]
+  mirror-debian: http://ftp.de.debian.org/debian/
+leaseweb:
+  netrange:
+    - 185.17.185.176/28
+  #mirror-debian: http://mirror.nl.leaseweb.net/debian/
+marist:
+  netrange:
+    - 148.100.0.0/16
+  mirror-debian: http://ftp.us.debian.org/debian/
+osuosl:
+  netrange:
+    - 140.211.0.0/16
+  mirror-debian: http://debian.osuosl.org/debian
+sakura:
+  netrange:
+    - 133.242.99.74/32
+sanger:
+  netrange:
+    - 193.62.202.24/29
+  #resolvoptions: [single-request]
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
+scanplus:
+  netrange:
+    - 212.211.132.0/26
+    - 212.211.132.248/29
+    - 2001:a78::/64
+sil:
+  netrange:
+    - 86.59.118.144/28
+    - 2001:858:2:2::/64
+  mirror-debian: http://ftp.at.debian.org/debian/
+skroutz:
+  netrange:
+    - 154.57.0.248/29
+  mirror-debian: http://ftp.debian.org/debian
+ubc:
+  netrange:
+    - 209.87.16.0/24
+    - 2607:F8F0:614:1::/64
+    # old range:
+    - 206.12.19.0/24
+    - 2607:f8f0:610:4000::/64
+  mirror-debian: http://mirror-ubc.debian.org/debian/
+ugent:
+  netrange:
+    - 157.193.0.0/16
+umn:
+  netrange:
+    - 128.101.240.212
+unicamp:
+  netrange:
+    - 177.220.0.0/17
+  mirror-debian: http://ftp.br.debian.org/debian/
+utwente:
+  netrange:
+    - 130.89.0.0/16
+    - 2001:0610:1908::/48
+  # broken with dnssec
+xs4all:
+  # should be deleted
+  netrange:
+    - 194.109.137.216/29
+    - 2001:888:2000:12::/64
+ynic:
+  netrange:
+    - 144.32.168.64/28
+  mirror-debian: http://ftp.uk.debian.org/debian
+zivit:
+  netrange:
+    - 80.245.144.0/22
+  mirror-debian: http://debian.netcologne.de/debian/
+
+# vim:set et sts=2 ts=2 sw=2:

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
new file mode 100644 (file)
index 0000000..8aec035
--- /dev/null
+++ b/modules/debian_org/files/misc/local.yaml
@@ -0,0 +1,240 @@
+---
+nameinfo:
+  aagaard.debian.org: Thorvald Aagaard (June 8th, 1877 - March 22nd, 1937)
+  abel.debian.org: Carl Friedrich Abel (1723 - 1787)
+  acker.debian.org: Dieter Acker (November 3rd, 1940 - May 27th, 2006)
+  adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
+  antheil.debian.org: George Antheil (1900 - 1959)
+  arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
+  asachi.debian.org: Elena Asachi (1789 - 1877)
+  barriere.debian.org: Jean-Baptiste Barrière (May 2nd, 1707 - June 6th, 1747)
+  beach.debian.org: Amy Marcy Cheney Beach (September 5th, 1867 - December 27th, 1944)
+  beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
+  bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
+  binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
+  boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904)
+  busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
+  buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
+  byrd.debian.org: William Byrd (1543 - July 4th, 1623)
+  casulana.debian.org: Maddalena Casulana (c. 1544 - c. 1590)
+  clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832)
+  coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
+  czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
+  danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
+  delfin.debian.org: Carmelina Delfin (c. 1900 - after 1948)
+  diabelli.debian.org: Anton Diabelli (September 5th, 1781 - April 7th, 1858)
+  dinis.debian.org: Dinis of Portugal (October 9th, 1261 - January 7th, 1325)
+  dillon.debian.org: Fannie Charles Dillon (March 16th, 1881 - February 21st, 1947)
+  donizetti.debian.org: Gaetano Donizetti (November 29th, 1797 - April 8th, 1848)
+  draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
+  eberlin.debian.org: Johann Ernst Eberlin (March 1702 27th - June 19th, 1762)
+  eller.debian.org: Heino Eller (March 7th, 1887 - June 16th, 1970)
+  elgar.debian.org: Edward Elgar (1857 - 1934)
+  falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946)
+  fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
+  fasolo.debian.org: Giovanni Battista Fasolo, O.F.M. (ca. 1598 - after 1664)
+  fayrfax.debian.org: Robert Fayrfax (April 23rd, 1464 - October 24th, 1521)
+  fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried))
+  finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
+  fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
+  gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
+  gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
+  gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
+  gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956)
+  handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
+  harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
+  hartmann.debian.org: Karl Amadeus Hartmann (August 2nd, 1905 - December 5th, 1963)
+  hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783)
+  henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012)
+  hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
+  jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980)
+  kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
+  klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
+  lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
+  lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
+  lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
+  mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918)
+  melartin.debian.org: Erkki Melartin (February 7th, 1875 - February 14th, 1937)
+  menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st, 2007)
+  manziarly.debian.org: Marcelle de Manziarly (October 1st/13th, 1899 -  May 12th, 1989)
+  mekeel.debian.org: Joyce Mekeel (July 6th, 1931 - Dec 29th, 1997)
+  milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
+  minkus.debian.org: Ludwig Minkus (March 23rd 1826 - December 7th, 1917)
+  muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
+  nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
+  olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
+  paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
+  partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
+  pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)
+  petrova.debian.org: Mara Petrova (May 15th, 1921 - June 7th. 1997)
+  pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
+  philp.debian.org: Elizabeth Philp (1827 - November 26th, 1885)
+  picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
+  pieta.debian.org: Michielina della Pietà (fl. ca. 1700 - 1744)
+  pinel.debian.org: Julie Pinel (fl. 1710 - 1737)
+  pizzetti.debian.org: Ildebrando Pizzetti (20 September 1880 - 13 February 1968)
+  plummer.debian.org: John Plummer (c. 1410 - c. 1483)
+  porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
+  porta.debian.org: Giovanni Porta (c. 1675 - 21 June 1755)
+  praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
+  prokofiev.debian.org: Sergei Sergeyevich Prokofiev (April 27th, 1891 - March 5th, 1953)
+  quantz.debian.org: Johann Joachim Quantz (January 30th, 1697 - July 12th, 1773)
+  rachmaninoff: Sergei Vasilievich Rachmaninoff (1 April 1873 - 28 March 1943)
+  rainier.debian.org: Ivy Priaulx Rainier (February 3rd, 1903 - October 10th, 1986)
+  rapoport.debian.org: Eda Rothstein Rapoport (December 25th, 1890 - May 9th, 1968)
+  reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
+  respighi.debian.org: Elsa Respighi (née Olivieri-Sangiacomo) (March 24th, 1894 - March 17th, 1996)
+  sallinen.debian.org: Aulis Sallinen (born April 9, 1935)
+  santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
+  schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
+  sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867)
+  seger.debian.org: Josef Seger (March 21st, 1716 - April 22nd, 1782)
+  senfter.debian.org: Johanna Senfter (November, 27th, 1879 - August 11th, 1961)
+  setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
+  sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
+  smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
+  sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
+  sor.debian.org: Fernando Sor (February 14th, 1778 - July 10th, 1839)
+  soriano.debian.org: Francesco Soriano (1548 or 1549 - July 19th, 1621)
+  stockhausen.debian.org: Karlheinz Stockhausen (August 22nd, 1928 - December 5th, 2007)
+  storace.debian.org: Stephen Storace (April 4th, 1762 - March 19th, 1796)
+  spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
+  tate.debian.org: Phyllis Tate (April 6th, 1911 - May 29th, 1987)
+  tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
+  ticharich.debian.org: Zdenka Ticharich (September 26th, 1900 - February 15th, 1979)
+  tye.debian.org: Christopher Tye (c.1505 - 1573)
+  ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944)
+  usper.debian.org: Francesco Usper (November 1st, 1561 - February 24th, 1641)
+  vento.debian.org: Ivo de Vento (1543/1545 - 1575)
+  vittoria.debian.org: Tomás Luis da Vittoria (ca. 1548 - August 27th, 1611)
+  vogler.debian.org: Georg Joseph Vogler (June 15th, 1749 - May 6th, 1814)
+  wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
+  wilder.debian.org: Alec Wilder (February 16th, 1907 - December 24th, 1980)
+  wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
+  wuiet.debian.org: Caroline Wuiet (1766 - 1835)
+  zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
+  zani.debian.org: Andrea Teodoro Zani (November 11th, 1696 - September 28th, 1757)
+  zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
+  zemlinsky.debian.org: Alexander von Zemlinsky (October 14th, 1871 - March 15th 1942)
+footer:
+  dummy: foo
+  #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
+  #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
+host_settings:
+  heavy_exim:
+    # mail front-ends
+    - mailly.debian.org
+    - muffat.debian.org
+    # other mail receivers
+    - buxtehude.debian.org
+    - draghi.debian.org
+    - master.debian.org
+    - nono.debian.org
+    - picconi.debian.org
+    - pinel.debian.org
+    - quantz.debian.org
+    - reger.debian.org
+    - tye.debian.org
+    - vento.debian.org
+    - wuiet.debian.org
+  not-bacula-client:
+    # porterbox
+    - abel.debian.org
+    - asachi.debian.org
+    - barriere.debian.org
+    - binet.debian.org
+    - eller.debian.org
+    - falla.debian.org
+    - fischer.debian.org
+    - harris.debian.org
+    - minkus.debian.org
+    - partch.debian.org
+    - pizzetti.debian.org
+    - plummer.debian.org
+    - smetana.debian.org
+    - zelenka.debian.org
+    # buildd
+    - antheil.debian.org
+    - arm-arm-01.debian.org
+    - arm-arm-02.debian.org
+    - arm-arm-03.debian.org
+    - arm-arm-04.debian.org
+    - arm-conova-01.debian.org
+    - arm-conova-02.debian.org
+    - arm-conova-03.debian.org
+    - arm-conova-04.debian.org
+    - arm-linaro-01.debian.org
+    - arm-linaro-03.debian.org
+    - arnold.debian.org
+    - eberlin.debian.org
+    - fano.debian.org
+    - fayrfax.debian.org
+    - fils.debian.org
+    - finzi.debian.org
+    - hartmann.debian.org
+    - hasse.debian.org
+    - henze.debian.org
+    - hoiby.debian.org
+    - mips-aql-01.debian.org
+    - mips-aql-02.debian.org
+    - mips-aql-04.debian.org
+    - mips-aql-05.debian.org
+    - mips-aql-06.debian.org
+    - mips-sil-01.debian.org
+    - mips-manda-01.debian.org
+    - mipsel-aql-01.debian.org
+    - mipsel-aql-02.debian.org
+    - mipsel-aql-03.debian.org
+    - mipsel-manda-01.debian.org
+    - mipsel-manda-02.debian.org
+    - mipsel-manda-03.debian.org
+    - mipsel-sil-01.debian.org
+    - porpora.debian.org
+    - powerpc-osuosl-01.debian.org
+    - powerpc-unicamp-01.debian.org
+    - ppc64el-osuosl-01.debian.org
+    - ppc64el-unicamp-01.debian.org
+    - praetorius.debian.org
+    - spontini.debian.org
+    - x86-grnet-01.debian.org
+    - zandonai.debian.org
+    - zani.debian.org
+    - zemlinsky.debian.org
+    - x86-bm-01.debian.org
+    - x86-csail-01.debian.org
+    - x86-csail-02.debian.org
+    - x86-ubc-01.debian.org
+  broken-rtc:
+    - abel.debian.org
+    - antheil.debian.org
+    - arm-arm-01.debian.org
+    - arm-arm-02.debian.org
+    - arm-arm-03.debian.org
+    - arnold.debian.org
+    - eller.debian.org
+    - harris.debian.org
+    - hasse.debian.org
+    - henze.debian.org
+    - hoiby.debian.org
+    - mips-aql-01.debian.org
+    - mips-aql-02.debian.org
+    - mips-aql-04.debian.org
+    - mips-aql-05.debian.org
+    - mips-aql-06.debian.org
+    - mips-manda-01.debian.org
+    - mips-sil-01.debian.org
+    - mipsel-aql-03.debian.org
+    - mipsel-manda-03.debian.org
+    - mipsel-sil-01.debian.org
+  mail_port:
+    klecker.debian.org: 2025
+    zani.debian.org: 587
+  no_munin:
+    - fano.debian.org
+  entropy_key:
+    - czerny.debian.org
+    - grnet-node01.debian.org
+    # - ubc-bl2.debian.org
+    - storace.debian.org
+  buildd_master:
+    - wuiet.debian.org

diff --git a/modules/debian_org/misc/hoster.yaml b/modules/debian_org/misc/hoster.yaml
deleted file mode 100644 (file)
index 3028f68..0000000
--- a/modules/debian_org/misc/hoster.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
----
-1und1-sec:
-  netrange:
-    - 195.20.242.64/26
-    - 212.227.126.32/27
-    - 2001:8d8:2:1::/64
-accumu:
-  netrange:
-    - 130.239.0.0/16
-    - 130.242.6.0/24
-    - 2001:6b0:e::/48
-    - 2001:6b0:19::/48
-aql:
-  netrange:
-    - 141.170.6.144/28
-  mirror-debian: http://ftp.uk.debian.org/debian/
-arm:
-  netrange:
-    - 217.140.96.0/22
-  entropy_provider_hoster: sil
-  mirror-debian: http://mirror.bytemark.co.uk/debian/
-brown:
-  netrange:
-    - 138.16.160.0/24
-  # all hosts have their own recursor
-  #mirror-debian: file:///srv/ftp-master.debian.org/mirror/ftp-master/
-  mirror-debian: http://ftp.us.debian.org/debian
-br:
-  # rename to c3sl
-  # University Federal do Parana (.br)
-  netrange:
-    - 200.17.192.0/19
-bytemark:
-  netrange:
-    - 5.153.231.0/24
-    - 89.16.160.112/29
-    - 2001:41c8:1000::/48
-    - 2001:41c8:61::/125
-  mirror-debian: http://mirror.bm.debian.org/debian
-carnet:
-  netrange:
-    - 193.198.0.0/16
-anu:
-  netrange:
-    - 150.203.164.0/24
-    - 2001:388:1034:2900::/64
-  #mirror-debian: http://mirror.linux.org.au/debian
-  #mirror-debian: http://ftp.au.debian.org/debian
-conova:
-  netrange:
-    - 217.196.149.224/28
-  mirror-debian: http://mirror.netcologne.de/debian/
-csail:
-  netrange:
-    - 128.31.0.0/24
-  mirror-debian: http://debian.csail.mit.edu/debian/
-dgi:
-  netrange:
-    - 93.94.130.128/26
-freenet:
-  netrange:
-    - 62.104.0.0/16
-gatech:
-  netrange:
-    - 128.61.240.0/23
-  mirror-debian: http://debian.gtisc.gatech.edu/debian/
-grnet:
-  netrange:
-    - 194.177.211.192/27
-    - 2001:648:2ffc:deb::/64
-  mirror-debian: http://ftp.gr.debian.org/debian/
-helsinki:
-  netrange:
-    - 193.167.160.0/23
-  # all hosts have their own recursor
-isc:
-  netrange:
-    - 149.20.0.0/16
-    - 2001:4F8::/32
-uni-karlsruhe:
-  # rename to karlsruhe
-  netrange:
-    - 129.143.160.0/29
-    - 2001:7c0:400:1337::/64
-  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
-linaro:
-  netrange:
-    - 64.28.108.83/32
-    - 64.28.108.84/32
-    - 64.28.108.85/32
-  mirror-debian: http://ftp.us.debian.org/debian/
-'man-da':
-  netrange:
-    - 82.195.75.64/26
-    - 2001:41b8:202:deb::/64
-  #mirror-debian: http://debian.netcologne.de/debian/ [currently unstable]
-  mirror-debian: http://ftp.de.debian.org/debian/
-leaseweb:
-  netrange:
-    - 185.17.185.176/28
-  #mirror-debian: http://mirror.nl.leaseweb.net/debian/
-marist:
-  netrange:
-    - 148.100.0.0/16
-  mirror-debian: http://ftp.us.debian.org/debian/
-osuosl:
-  netrange:
-    - 140.211.0.0/16
-  mirror-debian: http://debian.osuosl.org/debian
-sakura:
-  netrange:
-    - 133.242.99.74/32
-sanger:
-  netrange:
-    - 193.62.202.24/29
-  #resolvoptions: [single-request]
-  mirror-debian: http://mirror.bytemark.co.uk/debian/
-scanplus:
-  netrange:
-    - 212.211.132.0/26
-    - 212.211.132.248/29
-    - 2001:a78::/64
-sil:
-  netrange:
-    - 86.59.118.144/28
-    - 2001:858:2:2::/64
-  mirror-debian: http://ftp.at.debian.org/debian/
-skroutz:
-  netrange:
-    - 154.57.0.248/29
-  mirror-debian: http://ftp.debian.org/debian
-ubc:
-  netrange:
-    - 209.87.16.0/24
-    - 2607:F8F0:614:1::/64
-    # old range:
-    - 206.12.19.0/24
-    - 2607:f8f0:610:4000::/64
-  mirror-debian: http://mirror-ubc.debian.org/debian/
-ugent:
-  netrange:
-    - 157.193.0.0/16
-umn:
-  netrange:
-    - 128.101.240.212
-unicamp:
-  netrange:
-    - 177.220.0.0/17
-  mirror-debian: http://ftp.br.debian.org/debian/
-utwente:
-  netrange:
-    - 130.89.0.0/16
-    - 2001:0610:1908::/48
-  # broken with dnssec
-xs4all:
-  # should be deleted
-  netrange:
-    - 194.109.137.216/29
-    - 2001:888:2000:12::/64
-ynic:
-  netrange:
-    - 144.32.168.64/28
-  mirror-debian: http://ftp.uk.debian.org/debian
-zivit:
-  netrange:
-    - 80.245.144.0/22
-  mirror-debian: http://debian.netcologne.de/debian/
-
-# vim:set et sts=2 ts=2 sw=2:

diff --git a/modules/debian_org/misc/local.yaml b/modules/debian_org/misc/local.yaml
deleted file mode 100644 (file)
index 8aec035..0000000
--- a/modules/debian_org/misc/local.yaml
+++ /dev/null
@@ -1,240 +0,0 @@
----
-nameinfo:
-  aagaard.debian.org: Thorvald Aagaard (June 8th, 1877 - March 22nd, 1937)
-  abel.debian.org: Carl Friedrich Abel (1723 - 1787)
-  acker.debian.org: Dieter Acker (November 3rd, 1940 - May 27th, 2006)
-  adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
-  antheil.debian.org: George Antheil (1900 - 1959)
-  arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
-  asachi.debian.org: Elena Asachi (1789 - 1877)
-  barriere.debian.org: Jean-Baptiste Barrière (May 2nd, 1707 - June 6th, 1747)
-  beach.debian.org: Amy Marcy Cheney Beach (September 5th, 1867 - December 27th, 1944)
-  beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
-  bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
-  binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
-  boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904)
-  busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
-  buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
-  byrd.debian.org: William Byrd (1543 - July 4th, 1623)
-  casulana.debian.org: Maddalena Casulana (c. 1544 - c. 1590)
-  clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832)
-  coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
-  czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
-  danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
-  delfin.debian.org: Carmelina Delfin (c. 1900 - after 1948)
-  diabelli.debian.org: Anton Diabelli (September 5th, 1781 - April 7th, 1858)
-  dinis.debian.org: Dinis of Portugal (October 9th, 1261 - January 7th, 1325)
-  dillon.debian.org: Fannie Charles Dillon (March 16th, 1881 - February 21st, 1947)
-  donizetti.debian.org: Gaetano Donizetti (November 29th, 1797 - April 8th, 1848)
-  draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
-  eberlin.debian.org: Johann Ernst Eberlin (March 1702 27th - June 19th, 1762)
-  eller.debian.org: Heino Eller (March 7th, 1887 - June 16th, 1970)
-  elgar.debian.org: Edward Elgar (1857 - 1934)
-  falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946)
-  fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
-  fasolo.debian.org: Giovanni Battista Fasolo, O.F.M. (ca. 1598 - after 1664)
-  fayrfax.debian.org: Robert Fayrfax (April 23rd, 1464 - October 24th, 1521)
-  fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried))
-  finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
-  fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
-  gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
-  gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
-  gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
-  gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956)
-  handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
-  harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
-  hartmann.debian.org: Karl Amadeus Hartmann (August 2nd, 1905 - December 5th, 1963)
-  hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783)
-  henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012)
-  hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
-  jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980)
-  kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
-  klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
-  lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
-  lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
-  lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
-  mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918)
-  melartin.debian.org: Erkki Melartin (February 7th, 1875 - February 14th, 1937)
-  menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st, 2007)
-  manziarly.debian.org: Marcelle de Manziarly (October 1st/13th, 1899 -  May 12th, 1989)
-  mekeel.debian.org: Joyce Mekeel (July 6th, 1931 - Dec 29th, 1997)
-  milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
-  minkus.debian.org: Ludwig Minkus (March 23rd 1826 - December 7th, 1917)
-  muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
-  nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
-  olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
-  paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
-  partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
-  pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)
-  petrova.debian.org: Mara Petrova (May 15th, 1921 - June 7th. 1997)
-  pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
-  philp.debian.org: Elizabeth Philp (1827 - November 26th, 1885)
-  picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
-  pieta.debian.org: Michielina della Pietà (fl. ca. 1700 - 1744)
-  pinel.debian.org: Julie Pinel (fl. 1710 - 1737)
-  pizzetti.debian.org: Ildebrando Pizzetti (20 September 1880 - 13 February 1968)
-  plummer.debian.org: John Plummer (c. 1410 - c. 1483)
-  porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
-  porta.debian.org: Giovanni Porta (c. 1675 - 21 June 1755)
-  praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
-  prokofiev.debian.org: Sergei Sergeyevich Prokofiev (April 27th, 1891 - March 5th, 1953)
-  quantz.debian.org: Johann Joachim Quantz (January 30th, 1697 - July 12th, 1773)
-  rachmaninoff: Sergei Vasilievich Rachmaninoff (1 April 1873 - 28 March 1943)
-  rainier.debian.org: Ivy Priaulx Rainier (February 3rd, 1903 - October 10th, 1986)
-  rapoport.debian.org: Eda Rothstein Rapoport (December 25th, 1890 - May 9th, 1968)
-  reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
-  respighi.debian.org: Elsa Respighi (née Olivieri-Sangiacomo) (March 24th, 1894 - March 17th, 1996)
-  sallinen.debian.org: Aulis Sallinen (born April 9, 1935)
-  santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
-  schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
-  sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867)
-  seger.debian.org: Josef Seger (March 21st, 1716 - April 22nd, 1782)
-  senfter.debian.org: Johanna Senfter (November, 27th, 1879 - August 11th, 1961)
-  setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
-  sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
-  smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
-  sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
-  sor.debian.org: Fernando Sor (February 14th, 1778 - July 10th, 1839)
-  soriano.debian.org: Francesco Soriano (1548 or 1549 - July 19th, 1621)
-  stockhausen.debian.org: Karlheinz Stockhausen (August 22nd, 1928 - December 5th, 2007)
-  storace.debian.org: Stephen Storace (April 4th, 1762 - March 19th, 1796)
-  spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
-  tate.debian.org: Phyllis Tate (April 6th, 1911 - May 29th, 1987)
-  tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
-  ticharich.debian.org: Zdenka Ticharich (September 26th, 1900 - February 15th, 1979)
-  tye.debian.org: Christopher Tye (c.1505 - 1573)
-  ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944)
-  usper.debian.org: Francesco Usper (November 1st, 1561 - February 24th, 1641)
-  vento.debian.org: Ivo de Vento (1543/1545 - 1575)
-  vittoria.debian.org: Tomás Luis da Vittoria (ca. 1548 - August 27th, 1611)
-  vogler.debian.org: Georg Joseph Vogler (June 15th, 1749 - May 6th, 1814)
-  wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
-  wilder.debian.org: Alec Wilder (February 16th, 1907 - December 24th, 1980)
-  wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
-  wuiet.debian.org: Caroline Wuiet (1766 - 1835)
-  zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
-  zani.debian.org: Andrea Teodoro Zani (November 11th, 1696 - September 28th, 1757)
-  zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
-  zemlinsky.debian.org: Alexander von Zemlinsky (October 14th, 1871 - March 15th 1942)
-footer:
-  dummy: foo
-  #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
-  #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
-host_settings:
-  heavy_exim:
-    # mail front-ends
-    - mailly.debian.org
-    - muffat.debian.org
-    # other mail receivers
-    - buxtehude.debian.org
-    - draghi.debian.org
-    - master.debian.org
-    - nono.debian.org
-    - picconi.debian.org
-    - pinel.debian.org
-    - quantz.debian.org
-    - reger.debian.org
-    - tye.debian.org
-    - vento.debian.org
-    - wuiet.debian.org
-  not-bacula-client:
-    # porterbox
-    - abel.debian.org
-    - asachi.debian.org
-    - barriere.debian.org
-    - binet.debian.org
-    - eller.debian.org
-    - falla.debian.org
-    - fischer.debian.org
-    - harris.debian.org
-    - minkus.debian.org
-    - partch.debian.org
-    - pizzetti.debian.org
-    - plummer.debian.org
-    - smetana.debian.org
-    - zelenka.debian.org
-    # buildd
-    - antheil.debian.org
-    - arm-arm-01.debian.org
-    - arm-arm-02.debian.org
-    - arm-arm-03.debian.org
-    - arm-arm-04.debian.org
-    - arm-conova-01.debian.org
-    - arm-conova-02.debian.org
-    - arm-conova-03.debian.org
-    - arm-conova-04.debian.org
-    - arm-linaro-01.debian.org
-    - arm-linaro-03.debian.org
-    - arnold.debian.org
-    - eberlin.debian.org
-    - fano.debian.org
-    - fayrfax.debian.org
-    - fils.debian.org
-    - finzi.debian.org
-    - hartmann.debian.org
-    - hasse.debian.org
-    - henze.debian.org
-    - hoiby.debian.org
-    - mips-aql-01.debian.org
-    - mips-aql-02.debian.org
-    - mips-aql-04.debian.org
-    - mips-aql-05.debian.org
-    - mips-aql-06.debian.org
-    - mips-sil-01.debian.org
-    - mips-manda-01.debian.org
-    - mipsel-aql-01.debian.org
-    - mipsel-aql-02.debian.org
-    - mipsel-aql-03.debian.org
-    - mipsel-manda-01.debian.org
-    - mipsel-manda-02.debian.org
-    - mipsel-manda-03.debian.org
-    - mipsel-sil-01.debian.org
-    - porpora.debian.org
-    - powerpc-osuosl-01.debian.org
-    - powerpc-unicamp-01.debian.org
-    - ppc64el-osuosl-01.debian.org
-    - ppc64el-unicamp-01.debian.org
-    - praetorius.debian.org
-    - spontini.debian.org
-    - x86-grnet-01.debian.org
-    - zandonai.debian.org
-    - zani.debian.org
-    - zemlinsky.debian.org
-    - x86-bm-01.debian.org
-    - x86-csail-01.debian.org
-    - x86-csail-02.debian.org
-    - x86-ubc-01.debian.org
-  broken-rtc:
-    - abel.debian.org
-    - antheil.debian.org
-    - arm-arm-01.debian.org
-    - arm-arm-02.debian.org
-    - arm-arm-03.debian.org
-    - arnold.debian.org
-    - eller.debian.org
-    - harris.debian.org
-    - hasse.debian.org
-    - henze.debian.org
-    - hoiby.debian.org
-    - mips-aql-01.debian.org
-    - mips-aql-02.debian.org
-    - mips-aql-04.debian.org
-    - mips-aql-05.debian.org
-    - mips-aql-06.debian.org
-    - mips-manda-01.debian.org
-    - mips-sil-01.debian.org
-    - mipsel-aql-03.debian.org
-    - mipsel-manda-03.debian.org
-    - mipsel-sil-01.debian.org
-  mail_port:
-    klecker.debian.org: 2025
-    zani.debian.org: 587
-  no_munin:
-    - fano.debian.org
-  entropy_key:
-    - czerny.debian.org
-    - grnet-node01.debian.org
-    # - ubc-bl2.debian.org
-    - storace.debian.org
-  buildd_master:
-    - wuiet.debian.org

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index 9f628cb..4d09100 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -22,7 +22,7 @@ module Puppet::Parser::Functions
         next unless  localinfo[node]['entropy_key']
 
         addresses = allnodeinfo[node]['ipHostNumber']
-        thishoster = function_whohosts([addresses, "/etc/puppet/modules/debian_org/misc/hoster.yaml"])
+        thishoster = function_whohosts([addresses])
         name = thishoster['name']
 
         provider << node

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 1380a02..0695fdf 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -12,7 +12,7 @@ module Puppet::Parser::Functions
       unless nodeinfo['ldap']['ipHostNumber']
         raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
       end
-      nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian_org/misc/hoster.yaml"])
+      nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber']])
       nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
       nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
       nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 4359285..3192bb7 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -1,12 +1,14 @@
+require 'puppet/file_system'
+
 module Puppet::Parser::Functions
   newfunction(:whohosts, :type => :rvalue) do |args|
     require 'ipaddr'
     require 'yaml'
 
     ipAddrs = args[0]
-    yamlfile = args[1]
 
     ans = {"name" => "unknown"}
+    yamlfile = Puppet::Parser::Files.find_file('debian_org/misc/hoster.yaml', compiler.environment)
     yaml = YAML.load_file(yamlfile)
 
     ipAddrs.each do |addr|

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index 0c64b22..42a4795 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -1,8 +1,9 @@
+require 'puppet/file_system'
+
 module Puppet::Parser::Functions
   newfunction(:yamlinfo, :type => :rvalue) do |args|
 
     host = args[0]
-    yamlfile = args[1]
 
     read_yaml = lambda { |yaml, host|
       results = {}
@@ -41,6 +42,7 @@ module Puppet::Parser::Functions
 
     require 'yaml'
 
+    yamlfile = Puppet::Parser::Files.find_file('debian_org/misc/local.yaml', compiler.environment)
     yaml = YAML.load_file(yamlfile)
     ret = {}
 

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 19a64b5..2f9dc69 100644 (file)
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,7 +1,7 @@
 class site {
 
-       $localinfo = yamlinfo('*', '/etc/puppet/modules/debian_org/misc/local.yaml')
-       $nodeinfo  = nodeinfo($::fqdn, '/etc/puppet/modules/debian_org/misc/local.yaml')
+       $localinfo = yamlinfo('*')
+       $nodeinfo  = nodeinfo($::fqdn)
        $allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
         $roles = hiera('roles')