mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
* Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18602
This commit is contained in:
Eelco Dolstra
commit
a21f18e81f
9 changed files with 197 additions and 668 deletions
|
|
@ -73,6 +73,7 @@
|
|||
./services/networking/ejabberd.nix
|
||||
./services/networking/firewall.nix
|
||||
./services/networking/gnunet.nix
|
||||
./services/networking/gvpe.nix
|
||||
./services/networking/gw6c.nix
|
||||
./services/networking/ifplugd.nix
|
||||
./services/networking/ircd-hybrid.nix
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ in
|
|||
src = ./bashrc.sh;
|
||||
|
||||
bash = pkgs.bash;
|
||||
systemPath = config.system.path;
|
||||
wrapperDir = config.security.wrapperDir;
|
||||
modulesTree = config.system.modulesTree;
|
||||
shellInit = config.environment.shellInit;
|
||||
|
|
|
|||
|
|
@ -71,6 +71,9 @@ in zipModules ([]
|
|||
++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
|
||||
++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
|
||||
|
||||
# X11
|
||||
++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
|
||||
|
||||
# KDE
|
||||
++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,656 +0,0 @@
|
|||
>grand.central.org #GCO Public CellServDB 29 Jun 2009
|
||||
18.9.48.14 #grand.mit.edu
|
||||
128.2.203.61 #penn.central.org
|
||||
130.237.48.87 #andrew.e.kth.se
|
||||
>wu-wien.ac.at #University of Economics, Vienna, Austria
|
||||
137.208.3.33 #goya.wu-wien.ac.at
|
||||
137.208.7.57 #caravaggio.wu-wien.ac.at
|
||||
137.208.127.57 #vermeer.wu-wien.ac.at
|
||||
>hephy.at #hephy-vienna
|
||||
193.170.243.10 #mowgli.oeaw.ac.at
|
||||
193.170.243.12 #baloo.oeaw.ac.at
|
||||
193.170.243.14 #akela.oeaw.ac.at
|
||||
>cgv.tugraz.at #CGV cell
|
||||
129.27.218.30 #phobos.cgv.tugraz.at
|
||||
129.27.218.31 #deimos.cgv.tugraz.at
|
||||
129.27.218.32 #trinculo.cgv.tugraz.at
|
||||
>itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus
|
||||
129.27.161.7 #faepafs1.tu-graz.ac.at
|
||||
129.27.161.15 #faepafs2.tu-graz.ac.at
|
||||
129.27.161.114 #faepafs3.tu-graz.ac.at
|
||||
>sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi
|
||||
132.216.24.122 #germain.sums.math.mcgill.ca
|
||||
132.216.24.125 #turing.sums.math.mcgill.ca
|
||||
>cern.ch #European Laboratory for Particle Physics, Geneva
|
||||
137.138.128.148 #afsdb1.cern.ch
|
||||
137.138.246.50 #afsdb3.cern.ch
|
||||
137.138.246.51 #afsdb2.cern.ch
|
||||
>ams.cern.ch #AMS Experiment
|
||||
137.138.188.185 #ams.cern.ch
|
||||
137.138.199.58 #pcamsf4.cern.ch
|
||||
>epfl.ch #Swiss Federal Institute of Technology at Lausanne
|
||||
128.178.109.111 #kd1.epfl.ch
|
||||
128.178.109.112 #kd2.epfl.ch
|
||||
128.178.109.113 #kd3.epfl.ch
|
||||
>ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland
|
||||
82.130.118.32 #afs-db-1.ethz.ch
|
||||
>psi.ch #Paul Scherrer Institut - Villigen, Switzerland
|
||||
129.129.190.140 #afs00.psi.ch
|
||||
129.129.190.141 #afs01.psi.ch
|
||||
129.129.190.142 #afs02.psi.ch
|
||||
>extundo.com #Simon Josefsson's cell
|
||||
195.42.214.241 #slipsten.extundo.com
|
||||
>freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA
|
||||
66.210.104.254 #afs0.freedaemon.com
|
||||
>membrain.com #membrain.com
|
||||
66.93.118.125 #stormy
|
||||
130.85.24.11 #weasel
|
||||
130.85.24.13 #straykitten
|
||||
>setfilepointer.com #SetFilePointer.com
|
||||
63.224.10.2 #hamlet.SetFilePointer.com
|
||||
63.224.10.4 #troilus.SetFilePointer.com
|
||||
>sodre.cx #Sodre.cx
|
||||
128.8.140.165 #greed.sodre.cx
|
||||
>ruk.cuni.cz #Charles University Computer Centre, Prague, CR
|
||||
195.113.0.36 #asterix.ruk.cuni.cz
|
||||
195.113.0.37 #obelix.ruk.cuni.cz
|
||||
195.113.0.40 #sal.ruk.cuni.cz
|
||||
>ics.muni.cz #Masaryk university
|
||||
147.251.3.11 #grond.ics.muni.cz
|
||||
147.251.3.15 #nimloth.ics.muni.cz
|
||||
147.251.3.19 #sirion.ics.muni.cz
|
||||
>zcu.cz #University of West Bohemia, Czech Republic
|
||||
147.228.10.18 #sauron.zcu.cz
|
||||
147.228.52.10 #oknos.zcu.cz
|
||||
147.228.52.17 #nic.zcu.cz
|
||||
>desy.de #Deutsches Elektronen-Synchrotron
|
||||
131.169.2.19 #afsdb2.desy.de
|
||||
131.169.2.20 #afsdb3.desy.de
|
||||
131.169.244.60 #solar00.desy.de
|
||||
>gppc.de #GPP Chemnitz mbH
|
||||
213.187.92.33 #gpp1.gppc.de
|
||||
213.187.92.34 #paulchen.gppc.de
|
||||
213.187.92.35 #lotus.gppc.de
|
||||
>cms.hu-berlin.de #Humboldt University Berlin
|
||||
141.20.1.65 #commodus.cms.hu-berlin.de
|
||||
141.20.1.66 #faustinus.cms.hu-berlin.de
|
||||
141.20.1.67 #marcellus.cms.hu-berlin.de
|
||||
>ifh.de #DESY Zeuthen
|
||||
141.34.22.10 #romulus.ifh.de
|
||||
141.34.22.11 #remus.ifh.de
|
||||
141.34.22.29 #hekate.ifh.de
|
||||
>lrz-muenchen.de #Leibniz Computing Centre, Germany
|
||||
129.187.10.36 #afs1.lrz-muenchen.de
|
||||
129.187.10.56 #afs3.lrz-muenchen.de
|
||||
129.187.10.57 #afs2.lrz-muenchen.de
|
||||
>ipp-garching.mpg.de #Institut fuer Plasmaphysik
|
||||
130.183.9.5 #afs-db1.rzg.mpg.de
|
||||
130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de
|
||||
130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de
|
||||
>mpe.mpg.de #MPE cell
|
||||
130.183.130.7 #irafs1.mpe-garching.mpg.de
|
||||
130.183.134.20 #irafs2.mpe-garching.mpg.de
|
||||
>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
|
||||
137.226.244.79 #remus.informatik.rwth-aachen.de
|
||||
>combi.tfh-wildau.de #Philips Research Lab
|
||||
194.95.50.106 #joda13.combi.tfh-wildau.de
|
||||
>tu-bs.de #Technical University of Braunschweig, Germany
|
||||
134.169.1.1 #rzafs1.rz.tu-bs.de
|
||||
134.169.1.5 #rzafs2.rz.tu-bs.de
|
||||
134.169.1.6 #rzafs3.rz.tu-bs.de
|
||||
>tu-chemnitz.de #Technische Universitaet Chemnitz, Germany
|
||||
134.109.2.1 #zuse.hrz.tu-chemnitz.de
|
||||
134.109.2.15 #phoenix.hrz.tu-chemnitz.de
|
||||
134.109.200.7 #aetius.hrz.tu-chemnitz.de
|
||||
>e18.ph.tum.de #Experimental Physics, TU Munich, Germany
|
||||
129.187.154.223 #hamlet.e18.physik.tu-muenchen.de
|
||||
>atlass01.physik.uni-bonn.de #Bonn ATLAS
|
||||
131.220.165.43 #atlass01.physik.uni-bonn.de
|
||||
>uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg
|
||||
132.230.6.237 #sv8.ruf.uni-freiburg.de
|
||||
132.230.6.239 #sv10.ruf.uni-freiburg.de
|
||||
>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
|
||||
132.230.6.234 #afs1.ruf.uni-freiburg.de
|
||||
132.230.6.235 #afs2.ruf.uni-freiburg.de
|
||||
132.230.77.16 #hepafs.physik.uni-freiburg.de
|
||||
>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
|
||||
134.100.106.44 #afs-core.physnet.uni-hamburg.de
|
||||
134.100.106.45 #afs-core2.physnet.uni-hamburg.de
|
||||
134.100.106.47 #afs-core3.physnet.uni-hamburg.de
|
||||
>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
|
||||
129.206.26.241 #hactar.mathi.uni-heidelberg.de
|
||||
>urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum)
|
||||
129.206.119.10 #afsdb.urz.uni-heidelberg.de
|
||||
129.206.119.16 #afsdb1.urz.uni-heidelberg.de
|
||||
129.206.119.17 #afsdb2.urz.uni-heidelberg.de
|
||||
>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
|
||||
147.142.42.246 #mp-sun.ziti.uni-heidelberg.de
|
||||
>uni-hohenheim.de #University of Hohenheim
|
||||
144.41.2.2 #rs13.serv.uni-hohenheim.de
|
||||
144.41.2.3 #rs14.serv.uni-hohenheim.de
|
||||
144.41.2.4 #rs15.serv.uni-hohenheim.de
|
||||
>rz.uni-jena.de #Rechenzentrum University of Jena, Germany
|
||||
141.35.2.180 #afs00.rz.uni-jena.de
|
||||
141.35.2.181 #afs01.rz.uni-jena.de
|
||||
141.35.2.182 #afs02.rz.uni-jena.de
|
||||
>impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst.
|
||||
134.95.80.39 #forano.meteo.uni-koeln.de
|
||||
>meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology
|
||||
134.95.144.22 #afs1.meteo.uni-koeln.de
|
||||
134.95.144.24 #afs2.meteo.uni-koeln.de
|
||||
>rrz.uni-koeln.de #University of Cologne - Reg Comp Center
|
||||
134.95.19.3 #afsdb1.rrz.uni-koeln.de
|
||||
134.95.19.4 #afsdb2.rrz.uni-koeln.de
|
||||
134.95.19.10 #lyra.rrz.uni-koeln.de
|
||||
134.95.67.97 #afs.thp.uni-koeln.de
|
||||
134.95.112.8 #ladon.rrz.uni-koeln.de
|
||||
>physik.uni-mainz.de #institute of physics, university Mainz, Germany
|
||||
134.93.130.93 #hardy.physik.uni-mainz.de
|
||||
>uni-mannheim.de #Uni Mannheim (Rechenzentrum)
|
||||
134.155.97.204 #afsdb1.uni-mannheim.de
|
||||
134.155.97.205 #afsdb2.uni-mannheim.de
|
||||
134.155.97.206 #afsdb3.uni-mannheim.de
|
||||
>uni-paderborn.de #University of Paderborn, Germany
|
||||
131.234.137.10 #afsdb1.uni-paderborn.de
|
||||
131.234.137.11 #afsdb2.uni-paderborn.de
|
||||
131.234.137.12 #afsdb3.uni-paderborn.de
|
||||
>physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal
|
||||
132.195.104.3 #afs1.physik.uni-wuppertal.de
|
||||
132.195.104.230 #afs2.physik.uni-wuppertal.de
|
||||
>s-et.aau.dk #Aalborg Univ., The Student Society, Denmark
|
||||
130.225.196.22 #afs.s-et.aau.dk
|
||||
>ies.auc.dk #Aalborg Univ., Inst. of Electronic Systems, Denmark
|
||||
130.225.51.73 #afsdb1.kom.auc.dk
|
||||
130.225.51.74 #afsdb2.kom.auc.dk
|
||||
130.225.51.85 #afsdb3.kom.auc.dk
|
||||
>asu.edu #Arizona State University
|
||||
129.219.10.69 #authen2.asu.edu
|
||||
129.219.10.70 #authen1.asu.edu
|
||||
129.219.10.72 #authen3.asu.edu
|
||||
129.219.100.16 #authen4.asu.edu
|
||||
>mars.asu.edu #Mars Space Flight Facility - ASU Mars Research
|
||||
149.169.146.57 #kdc1.mars.asu.edu
|
||||
149.169.146.58 #kdc2.mars.asu.edu
|
||||
149.169.146.59 #kdc3.mars.asu.edu
|
||||
>eecs.berkeley.edu #University of California, Berkeley - EECS Dept.
|
||||
128.32.139.34 #greed.eecs.berkeley.edu
|
||||
128.32.139.35 #gluttony.eecs.berkeley.edu
|
||||
169.229.60.112 #envy.eecs.berkeley.edu
|
||||
>hep.caltech.edu #Caltech High Energy Physics
|
||||
131.215.116.20 #afs.hep.caltech.edu
|
||||
>ugcs.caltech.edu #Caltech UGCS lab
|
||||
131.215.176.65 #afs-c.ugcs.caltech.edu
|
||||
131.215.176.67 #afs-a.ugcs.caltech.edu
|
||||
131.215.176.68 #afs-b.ugcs.caltech.edu
|
||||
>clarkson.edu #Clarkson University, Potsdam, New York USA
|
||||
128.153.1.111 #arthur.clarkson.edu
|
||||
128.153.9.111 #lancelot.clarkson.edu
|
||||
128.153.17.111 #uther.clarkson.edu
|
||||
>andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell
|
||||
128.2.10.2 #afsdb-01.andrew.cmu.edu
|
||||
128.2.10.7 #afsdb-02.andrew.cmu.edu
|
||||
128.2.10.11 #afsdb-03.andrew.cmu.edu
|
||||
>mw.andrew.cmu.edu #Carnegie Mellon University - Middleware Test Cell
|
||||
128.2.234.24 #null.andrew.cmu.edu
|
||||
128.2.234.170 #mw-mgr.andrew.cmu.edu
|
||||
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
|
||||
128.2.204.149 #barium.club.cc.cmu.edu
|
||||
128.237.157.11 #sodium.club.cc.cmu.edu
|
||||
128.237.157.13 #potassium.club.cc.cmu.edu
|
||||
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
|
||||
128.2.40.134 #afs.chem.cmu.edu
|
||||
128.2.40.140 #afs2.chem.cmu.edu
|
||||
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
|
||||
128.2.184.215 #pumpkin.srv.cs.cmu.edu
|
||||
128.2.200.97 #watermelon.srv.cs.cmu.edu
|
||||
128.2.201.46 #strawberry.srv.cs.cmu.edu
|
||||
128.2.201.48 #cherry.srv.cs.cmu.edu
|
||||
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
|
||||
128.2.129.7 #porok.ece.cmu.edu
|
||||
128.2.129.8 #vicio.ece.cmu.edu
|
||||
128.2.129.9 #e-xing.ece.cmu.edu
|
||||
>scotch.ece.cmu.edu #CMU ECE CALCM research group
|
||||
128.2.134.82 #lagavulin.ece.cmu.edu
|
||||
>qatar.cmu.edu #Carnegie Mellon University - Qatar
|
||||
86.36.46.6 #afs1.qatar.cmu.edu
|
||||
86.36.46.7 #afs2.qatar.cmu.edu
|
||||
>sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab
|
||||
128.2.179.12 #nihao.sbp.ri.cmu.edu
|
||||
128.2.179.113 #youtheman.sbp.ri.cmu.edu
|
||||
>cnf.cornell.edu #CNF
|
||||
128.253.198.9 #hole.cnf.cornell.edu
|
||||
128.253.198.27 #smoke.cnf.cornell.edu
|
||||
128.253.198.231 #mist.cnf.cornell.edu
|
||||
>math.cornell.edu #Cornell Math Dept
|
||||
128.84.234.12 #pooh.math.cornell.edu
|
||||
128.84.234.16 #bernoulli.math.cornell.edu
|
||||
128.84.234.162 #dyno.math.cornell.edu
|
||||
>msc.cornell.edu #Cornell University Materials Science Center
|
||||
128.84.231.242 #miranda.ccmr.cornell.edu
|
||||
128.84.241.35 #co.ccmr.cornell.edu
|
||||
128.84.249.78 #dax.ccmr.cornell.edu
|
||||
>dbic.dartmouth.edu #Dartmouth Brain Imaging Center
|
||||
129.170.30.143 #dbicafs1.dartmouth.edu
|
||||
129.170.30.144 #dbicafs2.dartmouth.edu
|
||||
129.170.30.145 #dbicafs3.dartmouth.edu
|
||||
>northstar.dartmouth.edu #Dartmouth College Research Computing
|
||||
129.170.16.22 #halley.dartmouth.edu
|
||||
129.170.16.26 #andromeda.dartmouth.edu
|
||||
129.170.16.43 #cygnusx1.dartmouth.edu
|
||||
>cs.hm.edu #Department Computer Science Munich University Of Applied Science
|
||||
129.187.208.2 #srv1.informatik.fh-muenchen.de
|
||||
>eecs.harvard.edu #Harvard - EECS
|
||||
140.247.60.64 #lefkada.eecs.harvard.edu
|
||||
140.247.60.83 #corfu.eecs.harvard.edu
|
||||
>iastate.edu #Iowa State University
|
||||
129.186.1.243 #afsdb-1.iastate.edu
|
||||
129.186.6.243 #afsdb-2.iastate.edu
|
||||
129.186.142.243 #afsdb-3.iastate.edu
|
||||
>athena.mit.edu #MIT/Athena cell
|
||||
18.7.1.66 #paris.mit.edu.
|
||||
18.9.48.11 #castor.mit.edu
|
||||
18.9.48.12 #pollux.mit.edu.
|
||||
>dev.mit.edu #MIT/IS Development cell
|
||||
18.9.48.13 #saw.mit.edu.
|
||||
18.9.60.110 #hammer.mit.edu.
|
||||
18.9.60.111 #screw.mit.edu.
|
||||
>net.mit.edu #MIT/Network Group cell
|
||||
18.7.7.73 #gracie.mit.edu
|
||||
18.7.21.95 #george.mit.edu
|
||||
>numenor.mit.edu #Project Numenor
|
||||
18.243.2.49 #numenor.mit.edu
|
||||
>sipb.mit.edu #MIT/SIPB cell
|
||||
18.181.0.19 #reynelda.mit.edu
|
||||
18.181.0.22 #rosebud.mit.edu
|
||||
18.181.0.23 #ronald-ann.mit.edu
|
||||
>soap.mit.edu #MIT School Of Architecture & Planning
|
||||
18.89.1.204 #CRYPT.MIT.EDU
|
||||
18.89.3.46 #SOAP.MIT.EDU
|
||||
18.89.4.9 #ARCH.MIT.EDU
|
||||
>msu.edu #Michigan State University Main Cell
|
||||
35.9.7.10 #afsdb0.cl.msu.edu
|
||||
>nd.edu #University of Notre Dame
|
||||
129.74.223.17 #john.helios.nd.edu
|
||||
129.74.223.33 #lizardo.helios.nd.edu
|
||||
129.74.223.65 #buckaroo.helios.nd.edu
|
||||
>crc.nd.edu #University of Notre Dame - Center for Research Computing
|
||||
129.74.85.34 #afsdb1.crc.nd.edu
|
||||
129.74.85.35 #afsdb2.crc.nd.edu
|
||||
129.74.85.36 #afsdb3.crc.nd.edu
|
||||
>pitt.edu #University of Pittsburgh
|
||||
136.142.8.15 #afs09.srv.cis.pitt.edu
|
||||
136.142.8.20 #afs10.srv.cis.pitt.edu
|
||||
136.142.8.21 #afs11.srv.cis.pitt.edu
|
||||
>cs.pitt.edu #University of Pittsburgh - Computer Science
|
||||
130.49.220.11 #afs01.cs.pitt.edu
|
||||
130.49.220.12 #afs02.cs.pitt.edu
|
||||
130.49.220.13 #afs03.cs.pitt.edu
|
||||
>psc.edu #PSC (Pittsburgh Supercomputing Center)
|
||||
128.182.59.182 #shaggy.psc.edu
|
||||
128.182.66.184 #velma.psc.edu
|
||||
128.182.66.185 #daphne.psc.edu
|
||||
>scoobydoo.psc.edu #PSC Test Cell
|
||||
128.182.59.181 #scooby.psc.edu
|
||||
>cede.psu.edu #Penn State - Center for Engr. Design & Entrepeneurship
|
||||
146.186.218.10 #greenly.cede.psu.edu
|
||||
146.186.218.60 #b50.cede.psu.edu
|
||||
146.186.218.246 #stalin.cede.psu.edu
|
||||
>rose-hulman.edu #Rose-Hulman Institute of Technology
|
||||
137.112.7.11 #afs1.rose-hulman.edu
|
||||
137.112.7.12 #afs2.rose-hulman.edu
|
||||
137.112.7.13 #afs3.rose-hulman.edu
|
||||
>cs.rose-hulman.edu #Rose-Hulman CS Department
|
||||
137.112.40.10 #galaxy.cs.rose-hulman.edu
|
||||
>rpi.edu #Rensselaer Polytechnic Institute
|
||||
128.113.22.11 #saul.server.rpi.edu
|
||||
128.113.22.12 #joab.server.rpi.edu
|
||||
128.113.22.13 #korah.server.rpi.edu
|
||||
128.113.22.14 #achan.server.rpi.edu
|
||||
>hep.sc.edu #University of South Carolina, Dept. of Physics
|
||||
129.252.78.77 #cpeven.physics.sc.edu
|
||||
>cs.stanford.edu #Stanford University Computer Science Department
|
||||
171.64.64.10 #cs-afs-1.Stanford.EDU
|
||||
171.64.64.66 #cs-afs-2.stanford.edu
|
||||
171.64.64.69 #cs-afs-3.stanford.edu
|
||||
>ir.stanford.edu #Stanford University
|
||||
171.64.7.222 #afsdb1.stanford.edu
|
||||
171.64.7.234 #afsdb2.stanford.edu
|
||||
171.64.7.246 #afsdb3.stanford.edu
|
||||
>slac.stanford.edu #Stanford Linear Accelerator Center
|
||||
134.79.18.25 #afsdb1.slac.stanford.edu
|
||||
134.79.18.26 #afsdb2.slac.stanford.edu
|
||||
134.79.18.27 #afsdb3.slac.stanford.edu
|
||||
>physics.ucsb.edu #UC Santa Barbara, Physics Dept
|
||||
128.111.18.161 #ledzeppelin.physics.ucsb.edu
|
||||
>cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A
|
||||
128.114.123.14 #elan.ucsc.edu
|
||||
128.114.123.15 #ichabod.ucsc.edu
|
||||
128.114.123.18 #maneki.ucsc.edu
|
||||
>acm.uiuc.edu #ACM at the University of Illinois
|
||||
128.174.251.8 #alnitak.acm.uiuc.edu
|
||||
128.174.251.9 #alnilam.acm.uiuc.edu
|
||||
128.174.251.10 #mintaka.acm.uiuc.edu
|
||||
>illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory
|
||||
128.174.193.200 #ial.illigal.uiuc.edu
|
||||
128.174.193.201 #cac.illigal.uiuc.edu
|
||||
128.174.193.202 #gcs.illigal.uiuc.edu
|
||||
>ncsa.uiuc.edu #University of Illinois
|
||||
141.142.3.5 #congo.ncsa.uiuc.edu
|
||||
141.142.3.8 #nile.ncsa.uiuc.edu
|
||||
141.142.3.9 #kaskaskia.ncsa.uiuc.edu
|
||||
>umbc.edu #University of Maryland, Baltimore County
|
||||
130.85.24.23 #db2.afs.umbc.edu
|
||||
130.85.24.87 #db3.afs.umbc.edu
|
||||
130.85.24.101 #db1.afs.umbc.edu
|
||||
>glue.umd.edu #University of Maryland - Project Glue
|
||||
128.8.70.11 #olmec.umd.edu
|
||||
128.8.236.4 #egypt.umd.edu
|
||||
128.8.236.230 #babylon.umd.edu
|
||||
>wam.umd.edu #University of Maryland Network WAM Project
|
||||
128.8.70.9 #csc-srv.wam.umd.edu
|
||||
128.8.236.5 #avw-srv.wam.umd.edu
|
||||
128.8.236.231 #ptx-srv.wam.umd.edu
|
||||
>umich.edu #University of Michigan - Campus
|
||||
141.211.1.32 #fear.ifs.umich.edu
|
||||
141.211.1.33 #surprise.ifs.umich.edu
|
||||
141.211.1.34 #ruthless.ifs.umich.edu
|
||||
>atlas.umich.edu #ATLAS group cell in physics at University of Michigan
|
||||
141.211.43.102 #linat02.grid.umich.edu
|
||||
141.211.43.103 #linat03.grid.umich.edu
|
||||
141.211.43.104 #linat04.grid.umich.edu
|
||||
>citi.umich.edu #Center for Information Technology Integration
|
||||
141.211.133.5 #babylon.citi.umich.edu
|
||||
>sph.umich.edu #University of Michigan -- School of Public Health
|
||||
141.211.51.137 #afssph7.sph.umich.edu
|
||||
141.211.51.139 #afssph0.sph.umich.edu
|
||||
141.211.51.142 #afssph6.sph.umich.edu
|
||||
>isis.unc.edu #Univ. of NC at Chapel Hill - ITS
|
||||
152.2.1.5 #db0.isis.unc.edu
|
||||
152.2.1.6 #db1.isis.unc.edu
|
||||
152.2.1.7 #db2.isis.unc.edu
|
||||
>physics.unc.edu #Univ. of NC at Chapel Hill, Dept. of Physics
|
||||
152.2.4.1 #who.physics.unc.edu
|
||||
152.2.4.3 #what.physics.unc.edu
|
||||
152.2.4.5 #when.physics.unc.edu
|
||||
>uncc.edu #University of NC at Charlotte Mosaic AFS Cell
|
||||
152.15.10.70 #as-sm1.uncc.edu
|
||||
152.15.93.186 #as-ece1.uncc.edu
|
||||
152.15.181.175 #as-me1.uncc.edu
|
||||
>eng.utah.edu #University of Utah - Engineering
|
||||
155.98.111.9 #lenny.eng.utah.edu
|
||||
155.98.111.10 #carl.eng.utah.edu
|
||||
>cs.uwm.edu #University of Wisconsin--Milwaukee
|
||||
129.89.38.124 #solomons.cs.uwm.edu
|
||||
>cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept.
|
||||
128.105.132.14 #timon.cs.wisc.edu
|
||||
128.105.132.15 #pumbaa.cs.wisc.edu
|
||||
128.105.132.16 #zazu.cs.wisc.edu
|
||||
>engr.wisc.edu #University of Wisconsin-Madison, College of Engineering
|
||||
144.92.13.14 #larry.cae.wisc.edu
|
||||
144.92.13.15 #curly.cae.wisc.edu
|
||||
144.92.13.16 #moe.cae.wisc.edu
|
||||
>hep.wisc.edu #University of Wisconsin -- High Energy Physics
|
||||
128.104.28.219 #anise.hep.wisc.edu
|
||||
144.92.180.7 #rosemary.hep.wisc.edu
|
||||
144.92.180.30 #fennel.hep.wisc.edu
|
||||
>physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department
|
||||
128.104.160.13 #kendra.physics.wisc.edu
|
||||
128.104.160.14 #fray.physics.wisc.edu
|
||||
128.104.160.15 #buffy.physics.wisc.edu
|
||||
>ciemat.es #Ciemat, Madrid, Spain
|
||||
130.206.11.42 #afsdb1.ciemat.es
|
||||
130.206.11.217 #afsdb2.ciemat.es
|
||||
130.206.11.247 #afsdb3.ciemat.es
|
||||
>ifca.unican.es #Instituto de Fisica de Cantabria (IFCA), Santander, Spain
|
||||
193.144.209.20 #gridwall.ifca.unican.es
|
||||
>ific.uv.es #Instituto de Fisica Corpuscular, Valencia, Spain
|
||||
147.156.163.11 #alpha.ific.uv.es
|
||||
>biocenter.helsinki.fi #University of Helsinki, Institute of Biotechnology
|
||||
128.214.58.174 #afsdb1.biocenter.helsinki.fi
|
||||
128.214.88.114 #afsdb2.biocenter.helsinki.fi
|
||||
>dapnia.saclay.cea.fr #CEA DAPNIA
|
||||
132.166.32.7 #dphrsg.saclay.cea.fr
|
||||
132.166.32.12 #dphrsl.saclay.cea.fr
|
||||
>in2p3.fr #IN2P3 production cell
|
||||
134.158.104.11 #ccafsdb01.in2p3.fr
|
||||
134.158.104.12 #ccafsdb02.in2p3.fr
|
||||
134.158.232.11 #ccafsdb1.in2p3.fr
|
||||
134.158.232.12 #ccafsdb2.in2p3.fr
|
||||
134.158.232.13 #ccafsdb3.in2p3.fr
|
||||
>mcc.ac.gb #University of Manchester
|
||||
130.88.203.41 #nevis.mc.man.ac.uk
|
||||
130.88.203.144 #eryri.mc.man.ac.uk
|
||||
130.88.203.145 #scafell.mc.man.ac.uk
|
||||
>anl.gov #Argonne National Laboratory
|
||||
146.137.96.33 #arteus.it.anl.gov
|
||||
146.137.162.88 #agamemnon.it.anl.gov
|
||||
146.137.194.80 #antenor.it.anl.gov
|
||||
>rhic.bnl.gov #Relativistic Heavy Ion Collider
|
||||
130.199.6.51 #rafs03.rcf.bnl.gov
|
||||
130.199.6.52 #rafs02.rcf.bnl.gov
|
||||
130.199.6.69 #rafs01.rcf.bnl.gov
|
||||
>usatlas.bnl.gov #US Atlas Tier 1 Facility at BNL
|
||||
130.199.48.32 #aafs01.usatlas.bnl.gov
|
||||
130.199.48.33 #aafs02.usatlas.bnl.gov
|
||||
130.199.48.34 #aafs03.usatlas.bnl.gov
|
||||
>fnal.gov #Fermi National Acclerator Laboratory
|
||||
131.225.68.1 #fsus01.fnal.gov
|
||||
131.225.68.4 #fsus03.fnal.gov
|
||||
131.225.68.14 #fsus04.fnal.gov
|
||||
>ic-afs.arc.nasa.gov #Code IC, Ames Research Center
|
||||
128.102.105.62 #udanax.arc.nasa.gov
|
||||
>jpl.nasa.gov #Jet Propulsion Laboratory
|
||||
137.78.160.21 #afsdb08.jpl.nasa.gov
|
||||
137.78.160.22 #afsdb09.jpl.nasa.gov
|
||||
137.78.160.23 #afsdb10.jpl.nasa.gov
|
||||
>nersc.gov #National Energy Research Supercomputer Center
|
||||
128.55.128.250 #mars.nersc.gov
|
||||
128.55.128.252 #alfred.nersc.gov
|
||||
128.55.128.254 #lurch.nersc.gov
|
||||
>doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
|
||||
193.6.179.31 #afs.doe.atomki.hu
|
||||
>bme.hu #Budapest University of Technology and Economics
|
||||
152.66.241.6 #afs.iit.bme.hu
|
||||
>kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H
|
||||
148.6.8.14 #afs.kfki.hu
|
||||
>caspur.it #CASPUR Inter-University Computing Consortium, Rome
|
||||
193.204.5.45 #pomodoro.caspur.it
|
||||
193.204.5.46 #banana.caspur.it
|
||||
193.204.5.50 #maslo.caspur.it
|
||||
>enea.it #ENEA New Tech. Energy & Environment Agency, Italy
|
||||
192.107.54.5 #aixfs.frascati.enea.it
|
||||
192.107.54.11 #rs2ced.frascati.enea.it
|
||||
192.107.54.12 #43p.frascati.enea.it
|
||||
>fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
|
||||
192.107.90.2 #fusafs1.frascati.enea.it
|
||||
192.107.90.3 #fusafs2.frascati.enea.it
|
||||
192.107.90.4 #fusafs3.frascati.enea.it
|
||||
>icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy
|
||||
193.204.6.130 #icembfs.caspur.it
|
||||
>ictp.it #The Abdus Salam International Centre for Theoretical Physics (IC
|
||||
140.105.34.7 #afsdb1.ictp.it
|
||||
140.105.34.8 #afsdb2.ictp.it
|
||||
>infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
|
||||
131.154.1.7 #afscnaf.infn.it
|
||||
141.108.26.75 #afsrm1.roma1.infn.it
|
||||
192.84.134.75 #afsna.na.infn.it
|
||||
>ba.infn.it #INFN, Sezione di Bari
|
||||
193.206.185.235 #baafsserver.ba.infn.it
|
||||
193.206.185.236 #debsrv.ba.infn.it
|
||||
>kloe.infn.it #INFN, KLOE experiment at Laboratori di Frascati
|
||||
192.135.25.111 #kloeafs1.lnf.infn.it
|
||||
192.135.25.112 #kloeafs2.lnf.infn.it
|
||||
>le.infn.it #INFN, Sezione di Lecce
|
||||
192.84.152.40 #afs01.le.infn.it
|
||||
192.84.152.148 #afs02.le.infn.it
|
||||
>lnf.infn.it #INFN, Laboratori Nazionali di Frascati
|
||||
193.206.84.121 #afs1.lnf.infn.it
|
||||
193.206.84.122 #afs2.lnf.infn.it
|
||||
193.206.84.123 #afs3.lnf.infn.it
|
||||
>lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso
|
||||
192.84.135.21 #rsgs05.lngs.infn.it
|
||||
>pi.infn.it #INFN, Sezione di Pisa
|
||||
192.84.133.50 #aix1.pi.infn.it
|
||||
212.189.152.6 #afs1.pi.infn.it
|
||||
212.189.152.7 #afs2.pi.infn.it
|
||||
>roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
|
||||
193.205.159.17 #afsrm3.roma3.infn.it
|
||||
>psm.it #Progetto San Marco, Universita' di Roma-1
|
||||
151.100.1.65 #atlante.psm.uniroma1.it
|
||||
>tgrid.it #CASPUR-CILEA-CINECA Grid Cell
|
||||
193.204.5.33 #cccgrid.caspur.it
|
||||
>math.unifi.it #math.unifi.it
|
||||
150.217.34.182 #xeno.math.unifi.it
|
||||
>ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria
|
||||
151.100.85.253 #alfa.ing.uniroma1.it
|
||||
>dia.uniroma3.it #University Roma Tre - DIA
|
||||
193.204.161.79 #plm.dia.uniroma3.it
|
||||
193.204.161.118 #afs.dia.uniroma3.it
|
||||
>vn.uniroma3.it #University of Rome 3, Area Vasca Navale
|
||||
193.204.161.136 #alfa.dia.uniroma3.it
|
||||
193.204.161.137 #beta.dia.uniroma3.it
|
||||
193.204.161.138 #gamma.dia.uniroma3.it
|
||||
>italia #Italian public AFS cell
|
||||
193.204.5.9 #afs.caspur.it
|
||||
>cmf.nrl.navy.mil #Naval Research Lab - CCS
|
||||
134.207.10.68 #picard.cmf.nrl.navy.mil
|
||||
134.207.10.69 #riker.cmf.nrl.navy.mil
|
||||
134.207.10.70 #kirk.cmf.nrl.navy.mil
|
||||
>lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics
|
||||
132.250.114.2 #afs1.lcp.nrl.navy.mil
|
||||
132.250.114.4 #afs2.lcp.nrl.navy.mil
|
||||
132.250.114.6 #afs3.lcp.nrl.navy.mil
|
||||
>epitech.net #EPITECH, France
|
||||
163.5.255.41 #afs-db-1.epitech.net
|
||||
163.5.255.42 #afs-db-2.epitech.net
|
||||
>es.net #Energy Sciences Net
|
||||
198.128.3.21 #fs1.es.net
|
||||
198.128.3.22 #fs2.es.net
|
||||
198.128.3.23 #fs3.es.net
|
||||
>laroia.net #Laroia Networks
|
||||
66.66.102.254 #supercore.laroia.net
|
||||
>sinenomine.net #Sine Nomine Associates
|
||||
66.135.48.108 #tx2srv03.sinenomine.net
|
||||
72.73.30.42 #va.sinenomine.net
|
||||
>slackers.net #The Slackers' Network
|
||||
199.4.150.159 #alexandria.slackers.net
|
||||
>tproa.net #The People's Republic of Ames
|
||||
204.11.35.83 #service-3.tproa.net
|
||||
204.11.35.84 #service-4.tproa.net
|
||||
204.11.35.85 #service-5.tproa.net
|
||||
>interdose.net #Interdose Ltd. & Co. KG, Germany
|
||||
80.190.171.42 #bfd9000.tow5.interdose.net
|
||||
80.190.171.43 #bfd9001.tow5.interdose.net
|
||||
>nikhef.nl #The Dutch National Institute for High Energy Physics
|
||||
192.16.185.26 #afs1.nikhef.nl
|
||||
192.16.185.27 #afs2.nikhef.nl
|
||||
>1ts.org #1TS.ORG, Cambridge, MA
|
||||
69.25.196.51 #pancake.1ts.org
|
||||
>acm-csuf.org #California State Univerisity Fullerton ACM
|
||||
137.151.29.193 #afs1.acm-csuf.org
|
||||
>adrake.org #adrake.org
|
||||
128.2.98.241 #afs.adrake.org
|
||||
>bazquux.org #Baz Quux Organization
|
||||
66.207.142.196 #baxquux.org
|
||||
>coed.org #Adam Pennington's Cell
|
||||
66.93.61.184 #vice1.coed.org
|
||||
128.237.157.35 #vice3.coed.org
|
||||
>dementia.org #Dementia Unlimited
|
||||
128.2.13.209 #dedlock.dementia.org
|
||||
128.2.235.26 #meredith.dementia.org
|
||||
>dsrw.org #The DSRW
|
||||
65.103.82.83 #straylight.dsrw.org
|
||||
65.103.82.84 #chiba.dsrw.org
|
||||
65.103.82.85 #freeside.dsrw.org
|
||||
>hackish.org #Hackish.org
|
||||
98.210.160.157 #kurma.sys.hackish.org
|
||||
>idahofuturetruck.org #University of Idaho hybrid vehicle development
|
||||
12.18.238.210 #dsle210.fsr.net
|
||||
>mrow.org #MROW.ORG and RITLUG Cell
|
||||
88.198.46.111 #mrow.org
|
||||
129.21.205.119 #mirror.rit.edu
|
||||
>mrph.org #Mrph
|
||||
66.207.133.1 #sanber.mrph.org
|
||||
128.2.99.209 #hernandarias.mrph.org
|
||||
>mstacm.org #Missouri Science & Technology - ACM
|
||||
131.151.88.2 #acmwork.device.mst.edu
|
||||
>nimlabs.org #Nimlabs, Ink. Cell.
|
||||
18.238.1.103 #olfin.nimlabs.org
|
||||
18.238.1.105 #caerbanog.nimlabs.org
|
||||
>nomh.org #nomh.org
|
||||
204.29.154.12 #iota.nomh.org
|
||||
204.29.154.32 #adversity.xi.nomh.org
|
||||
>oc7.org #The OC7 Project
|
||||
128.2.122.140 #knife.oc7.org
|
||||
207.22.77.170 #spoon.oc7.org
|
||||
>pfriedma.org #pfriedma.org
|
||||
72.95.215.18 #vice.pfriedma.org
|
||||
>riscpkg.org #The RISC OS Packaging Project
|
||||
83.104.175.10 #delenn.riscpkg.org
|
||||
>kth.se #Royal Institute of Technology, Stockholm, Sweden
|
||||
130.237.32.145 #sonen.e.kth.se
|
||||
130.237.48.7 #anden.e.kth.se
|
||||
130.237.48.244 #fadern.e.kth.se
|
||||
>isk.kth.se #Royal Institute of Technology, ISK
|
||||
130.237.209.5 #afsdb2.isk.kth.se
|
||||
130.237.216.17 #afsdb1.isk.kth.se
|
||||
>it.kth.se #Royal Institute of Technology, IT
|
||||
130.237.212.15 #ptah.it.kth.se
|
||||
130.237.212.16 #toth.it.kth.se
|
||||
130.237.215.7 #isis.it.kth.se
|
||||
>md.kth.se #Royal Institute of Technology, MMK
|
||||
130.237.57.21 #euler.md.kth.se
|
||||
130.237.57.68 #trinity.md.kth.se
|
||||
130.237.57.72 #morpheus.md.kth.se
|
||||
>mech.kth.se #Royal Institute of Technology, MECH
|
||||
130.237.233.142 #matterhorn.mech.kth.se
|
||||
130.237.233.143 #castor.mech.kth.se
|
||||
130.237.233.144 #pollux.mech.kth.se
|
||||
>nada.kth.se #Royal Institute of Technology, NADA
|
||||
130.237.222.20 #kosmos.nada.kth.se
|
||||
130.237.223.12 #sputnik.nada.kth.se
|
||||
130.237.224.78 #mir.nada.kth.se
|
||||
130.237.227.23 #gagarin.nada.kth.se
|
||||
130.237.228.28 #laika.nada.kth.se
|
||||
>pdc.kth.se #Royal Institute of Technology, PDC
|
||||
130.237.232.29 #crab.pdc.kth.se
|
||||
130.237.232.112 #anna.pdc.kth.se
|
||||
130.237.232.114 #hokkigai.pdc.kth.se
|
||||
>stacken.kth.se #Stacken Computer Club
|
||||
130.237.234.3 #milko.stacken.kth.se
|
||||
130.237.234.43 #hot.stacken.kth.se
|
||||
130.237.234.101 #fishburger.stacken.kth.se
|
||||
>syd.kth.se #Royal Institute of Technology, KTH-Syd
|
||||
130.237.83.23 #afs.haninge.kth.se
|
||||
>physto.se #Physics department Stockholm University
|
||||
130.237.205.36 #sysafs1.physto.se
|
||||
130.237.205.72 #sysafs2.physto.se
|
||||
>sanchin.se #Sanchin Consulting AB, Sweden
|
||||
192.195.148.10 #sesan.sanchin.se
|
||||
>su.se #Stockholm University
|
||||
130.237.162.81 #afsdb1.su.se
|
||||
130.237.162.82 #afsdb2.su.se
|
||||
130.237.162.230 #afsdb3.su.se
|
||||
>f9.ijs.si #F9, Jozef Stefan Institue
|
||||
194.249.156.1 #brenta.ijs.si
|
||||
>p-ng.si #Nova Gorica Polytechnic
|
||||
193.2.120.2 #solkan.p-ng.si
|
||||
>hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
|
||||
144.122.31.131 #neutrino.physics.metu.edu.tr
|
||||
>phy.bris.ac.uk #Bristol University - phyics
|
||||
137.222.58.9 #afs1.phy.bris.ac.uk
|
||||
>inf.ed.ac.uk #School of Informatics, University of Edinburgh
|
||||
129.215.64.16 #afsdb0.inf.ed.ac.uk
|
||||
129.215.64.17 #afsdb1.inf.ed.ac.uk
|
||||
129.215.64.18 #afsdb2.inf.ed.ac.uk
|
||||
>ic.ac.uk #Imperial College London
|
||||
155.198.63.148 #icafs2.cc.ic.ac.uk
|
||||
155.198.63.149 #icafs1.cc.ic.ac.uk
|
||||
>hep.man.ac.uk #Manchester HEP
|
||||
194.36.2.3 #afs1.hep.man.ac.uk
|
||||
194.36.2.4 #afs2.hep.man.ac.uk
|
||||
194.36.2.5 #afs3.hep.man.ac.uk
|
||||
>rl.ac.uk #Rutherford Appleton Lab, England
|
||||
130.246.183.203 #afs1.gridpp.rl.ac.uk
|
||||
130.246.183.204 #afs2.gridpp.rl.ac.uk
|
||||
130.246.183.205 #afs3.gridpp.rl.ac.uk
|
||||
|
|
@ -2,8 +2,14 @@
|
|||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption mkIf;
|
||||
|
||||
cfg = config.services.openafsClient;
|
||||
cellServDB = ./CellServDB;
|
||||
|
||||
cellServDB = pkgs.fetchurl {
|
||||
url = http://dl.central.org/dl/cellservdb/CellServDB.2009-06-29;
|
||||
sha256 = "be566f850e88130333ab8bc3462872ad90c9482e025c60a92f728b5bac1b4fa9";
|
||||
};
|
||||
|
||||
afsConfig = pkgs.runCommand "afsconfig" {} ''
|
||||
ensureDir $out
|
||||
echo ${cfg.cellName} > $out/ThisCell
|
||||
|
|
|
|||
144
modules/services/networking/gvpe.nix
Normal file
144
modules/services/networking/gvpe.nix
Normal file
|
|
@ -0,0 +1,144 @@
|
|||
# GNU Virtual Private Ethernet
|
||||
|
||||
{config, pkgs, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption mkIf;
|
||||
|
||||
cfg = config.services.gvpe;
|
||||
|
||||
finalConfig = if cfg.configFile != null then
|
||||
cfg.configFile
|
||||
else if cfg.configText != null then
|
||||
pkgs.writeTextFile {
|
||||
name = "gvpe.conf";
|
||||
text = cfg.configText;
|
||||
}
|
||||
else
|
||||
throw "You must either specify contents of the config file or the config file itself for GVPE";
|
||||
|
||||
ifupScript = if cfg.ipAddress == null || cfg.subnet == null then
|
||||
throw "Specify IP address and subnet (with mask) for GVPE"
|
||||
else if cfg.nodename == null then
|
||||
throw "You must set node name for GVPE"
|
||||
else
|
||||
(pkgs.writeTextFile {
|
||||
name = "gvpe-if-up";
|
||||
text = ''
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$PATH:${pkgs.iproute}/sbin
|
||||
|
||||
ip link set $IFNAME up
|
||||
ip address add ${cfg.ipAddress} dev $IFNAME
|
||||
ip route add ${cfg.subnet} dev $IFNAME
|
||||
|
||||
${cfg.customIFSetup}
|
||||
'';
|
||||
executable = true;
|
||||
});
|
||||
|
||||
exec = "${pkgs.gvpe}/sbin/gvpe -c /var/gvpe -D ${cfg.nodename} "
|
||||
+ " ${cfg.nodename}.pid-file=/var/gvpe/gvpe.pid"
|
||||
+ " ${cfg.nodename}.if-up=if-up"
|
||||
+ " &> /var/log/gvpe";
|
||||
|
||||
inherit (cfg) startOn stopOn;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.gvpe = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to run gvpe
|
||||
'';
|
||||
};
|
||||
startOn = mkOption {
|
||||
default = "started network-interfaces";
|
||||
description = ''
|
||||
Condition to start GVPE
|
||||
'';
|
||||
};
|
||||
stopOn = mkOption {
|
||||
default = "stopping network-interfaces";
|
||||
description = ''
|
||||
Condition to stop GVPE
|
||||
'';
|
||||
};
|
||||
nodename = mkOption {
|
||||
default = null;
|
||||
description =''
|
||||
GVPE node name
|
||||
'';
|
||||
};
|
||||
configText = mkOption {
|
||||
default = null;
|
||||
example = ''
|
||||
tcp-port = 655
|
||||
udp-port = 655
|
||||
mtu = 1480
|
||||
ifname = vpn0
|
||||
|
||||
node = alpha
|
||||
hostname = alpha.example.org
|
||||
connect = always
|
||||
enable-udp = true
|
||||
enable-tcp = true
|
||||
on alpha if-up = if-up-0
|
||||
on alpha pid-file = /var/gvpe/gvpe.pid
|
||||
'';
|
||||
description = ''
|
||||
GVPE config contents
|
||||
'';
|
||||
};
|
||||
configFile = mkOption {
|
||||
default = null;
|
||||
example = "/root/my-gvpe-conf";
|
||||
description = ''
|
||||
GVPE config file, if already present
|
||||
'';
|
||||
};
|
||||
ipAddress = mkOption {
|
||||
default = null;
|
||||
description = ''
|
||||
IP address to assign to GVPE interface
|
||||
'';
|
||||
};
|
||||
subnet = mkOption {
|
||||
default = null;
|
||||
example = "10.0.0.0/8";
|
||||
description = ''
|
||||
IP subnet assigned to GVPE network
|
||||
'';
|
||||
};
|
||||
customIFSetup = mkOption {
|
||||
default = "";
|
||||
description = ''
|
||||
Additional commands to apply in ifup script
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
jobs.gvpe = {
|
||||
description = "GNU Virtual Private Ethernet node";
|
||||
|
||||
inherit startOn stopOn;
|
||||
|
||||
preStart = ''
|
||||
mkdir -p /var/gvpe
|
||||
mkdir -p /var/gvpe/pubkey
|
||||
chown root /var/gvpe
|
||||
chmod 700 /var/gvpe
|
||||
cp ${finalConfig} /var/gvpe/gvpe.conf
|
||||
cp ${ifupScript} /var/gvpe/if-up
|
||||
'';
|
||||
|
||||
inherit exec;
|
||||
|
||||
respawn = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -9,8 +9,8 @@ let
|
|||
# Put all the system cronjobs together.
|
||||
systemCronJobsFile = pkgs.writeText "system-crontab"
|
||||
''
|
||||
SHELL=${pkgs.bash}/bin/sh
|
||||
PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
|
||||
SHELL=${pkgs.bash}/bin/bash
|
||||
PATH=${config.system.path}/bin:${config.system.path}/sbin
|
||||
MAILTO="${config.services.cron.mailto}"
|
||||
${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ let
|
|||
exec > ~/.xsession-errors 2>&1
|
||||
''}
|
||||
|
||||
${optionalString cfg.startSSHAgent ''
|
||||
${optionalString cfg.startOpenSSHAgent ''
|
||||
if test -z "$SSH_AUTH_SOCK"; then
|
||||
# Restart this script as a child of the SSH agent. (It is
|
||||
# also possible to start the agent as a child that prints
|
||||
|
|
@ -43,6 +43,17 @@ let
|
|||
fi
|
||||
''}
|
||||
|
||||
${optionalString cfg.startGnuPGAgent ''
|
||||
if test -z "$SSH_AUTH_SOCK"; then
|
||||
# Restart this script as a child of the GnuPG agent.
|
||||
exec "${pkgs.gnupg2}/bin/gpg-agent" \
|
||||
--enable-ssh-support --daemon \
|
||||
--pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \
|
||||
--write-env-file "$HOME/.gpg-agent-info" \
|
||||
"$0" "$sessionType"
|
||||
fi
|
||||
''}
|
||||
|
||||
# Start a ConsoleKit session so that we get ownership of various
|
||||
# devices.
|
||||
if test -z "$XDG_SESSION_COOKIE"; then
|
||||
|
|
|
|||
|
|
@ -198,16 +198,26 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
startSSHAgent = mkOption {
|
||||
startOpenSSHAgent = mkOption {
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to start the SSH agent when you log in. The SSH agent
|
||||
Whether to start the OpenSSH agent when you log in. The OpenSSH agent
|
||||
remembers private keys for you so that you don't have to type in
|
||||
passphrases every time you make an SSH connection. Use
|
||||
<command>ssh-add</command> to add a key to the agent.
|
||||
'';
|
||||
};
|
||||
|
||||
startGnuPGAgent = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to start the GnuPG agent when you log in. The GnuPG agent
|
||||
remembers private keys for you so that you don't have to type in
|
||||
passphrases every time you make an SSH connection or sign/encrypt
|
||||
data. Use <command>ssh-add</command> to add a key to the agent.
|
||||
'';
|
||||
};
|
||||
|
||||
layout = mkOption {
|
||||
default = "us";
|
||||
description = ''
|
||||
|
|
@ -322,13 +332,24 @@ in
|
|||
|
||||
|
||||
###### implementation
|
||||
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = singleton
|
||||
{ assertion = config.services.hal.enable == true;
|
||||
message = "The X server needs HAL running. Set services.hal.enable to true";
|
||||
};
|
||||
assertions =
|
||||
[ { assertion = config.services.hal.enable == true;
|
||||
message = "The X server needs HAL running. Set services.hal.enable to true";
|
||||
}
|
||||
|
||||
{ assertion = if cfg.startOpenSSHAgent
|
||||
then !cfg.startGnuPGAgent
|
||||
else (if cfg.startGnuPGAgent
|
||||
then !cfg.startOpenSSHAgent
|
||||
else true);
|
||||
message =
|
||||
"The OpenSSH agent and GnuPG agent cannot be started both. " +
|
||||
"Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
|
||||
}
|
||||
];
|
||||
|
||||
boot.extraModulePackages =
|
||||
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
|
||||
|
|
|
|||
Loading…
Reference in a new issue