Author: eelco Date: 2010-07-08 13:34:34 +0000 (Thu, 08 Jul 2010) New Revision: 22530
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22530&view=rev Removed: services/trunk/apache-httpd/ services/trunk/configurations/ services/trunk/install.sh services/trunk/postgresql/ services/trunk/rollback-server.sh services/trunk/subversion/INSTALL services/trunk/subversion/builder.sh services/trunk/subversion/default.nix services/trunk/subversion/subversion-pre.conf services/trunk/subversion/subversion.conf services/trunk/upgrade-server.sh Log: * Removed obsolete files. Changes: Deleted: services/trunk/install.sh =================================================================== --- services/trunk/install.sh 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/install.sh 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,3 +0,0 @@ -#! /bin/sh - -./upgrade-server.sh $1 ./$1.nix production Deleted: services/trunk/rollback-server.sh =================================================================== --- services/trunk/rollback-server.sh 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/rollback-server.sh 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,25 +0,0 @@ -#! /bin/sh -e - -serverName=$1 -type=$2 -generation=$3 -if test "$type" != "test" -a "$type" != "production" -o -z "$generation"; then - echo "syntax: $0 NAME {test | production} GENERATION-NUMBER" - exit 1 -fi - -profiles=/nix/var/nix/profiles -profileName=$serverName-$type-server - - -echo "stopping current server..." -$profiles/$profileName/bin/control stop || true -sleep 5 - - -echo "rolling back..." -nix-env --profile "$profiles/$profileName" --switch-generation "$generation" - - -echo "starting old server..." -$profiles/$profileName/bin/control start Deleted: services/trunk/subversion/INSTALL =================================================================== --- services/trunk/subversion/INSTALL 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/subversion/INSTALL 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,122 +0,0 @@ -Prerequisites: the Subversion service is tested on Linux (i686-linux). -Nix itself also supports other platforms, but some packages may not -build or work properly. - - -Steps to get a running Subversion service (see http://svn.cs.uu.nl/ -for an example): - -- Install the latest Nix release, e.g., - - http://nix.cs.uu.nl/dist/nix/nix-0.10.1/ - - Nix should be installed in /nix (the default prefix), otherwise - pre-built binaries cannot be used. - -- Grab the services and Nixpkgs from our Subversion repository: - - $ svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services - $ svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs - -- Make sure that the services can find Nixpkgs: - - $ cd services - $ ln -s ../nixpkgs/pkgs/ . - -- To speed up building of the server (optional but recommended): - - $ nix-pull http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST - -- Customise: - - $ cd configurations/svn-template - - Edit ./default.nix, in particular `rootDir' (specify the directory - where you want to store the log files, repositories, user DB, etc.), - `hostName', `httpPort', `adminAddr', and `notificationSender'. - - You'll probably also want to change the UU logo to something else. - Just replace subversion/root/UU_merk.gif. - - (You may want to make a copy of svn-template for your local - changes.) - -- Start the test server (running on port 12081 by default): - - $ ../../upgrade-server.sh svn ./default.nix test - - This will build the server and all dependencies. (If you've done a - nix-pull, it will download pre-build binaries for most stuff, though - not Apache itself since that's being pre-built yet.) It may seem - that a lot is being built/downloaded (it is!), but this is to ensure - that the dependencies are exactly right. - - It will then start the server. So make sure that it works - (http://localhost:12081/). In particular - - * Check that you can create users. - * Check that you can create repositories. - * Check that checkouts works. - * Check that ViewCVS works. - - Every time you make a change to the configuration of the server, - re-run the command above to rebuild and restart the service. - -- Set a password for the `root' user: - - $ /nix/var/nix/profiles/svn-test-server/bin/resetpw.pl root PASSWORD - -- Start the production server (running on port 12080 by default): - - $ ../../upgrade-server.sh svn ./default.nix production - - It is usually a good idea to upgrade the test server before - upgrading the production server. - -- To stop either server: - - $ /nix/var/nix/profiles/svn-(test|production)-server/bin/control stop - -- To start either server: - - $ /nix/var/nix/profiles/svn-(test|production)-server/bin/control start - -- To roll back: - - $ /nix/var/nix/profiles/svn-(test|production)-server/bin/control stop - $ nix-env -p /nix/var/nix/profiles/svn-(test|production)-server --rollback - $ /nix/var/nix/profiles/svn-(test|production)-server/bin/control start - - (Or use --switch-generation instead of --rollback to go to a - specific generation.) - - -There are some utility commands in -/nix/var/nix/profiles/svn-(test|production)-server/bin: - -* `resetpw.pl USERNAME PASSWORD' resets a user's password. - -* `delete-repo.pl TRASH REPONAMES...' moves the specified repositories - to the directory TRASH. - -* `delete-user.pl USERNAME' deletes a user, after checking that the - user no longer is the owner of any repository and does not occur in - any ACL. - - -Some operations don't have a utility, but can be accomplished by -editing the database tables directly: - -* To change the owner of a repository: - - $ db_load -t hash -T .../repodb/svn-owners - REPONAME - OWNER - -* To make a repository hidden from the index: - - $ db_load -t hash -T .../repodb/svn-hidden-repos - REPONAME - 1 - - (Or "" instead of "1" to make it visible again.) Deleted: services/trunk/subversion/builder.sh =================================================================== --- services/trunk/subversion/builder.sh 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/subversion/builder.sh 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,53 +0,0 @@ -. $stdenv/setup - - -doSub() { - local src=$1 - local dst=$2 - ensureDir $(dirname $dst) - substituteAll $src $dst -} - - -defaultPath="$enscript/bin" -for i in ls tar gzip bzip2 diff sed; do - defaultPath="$defaultPath:$(dirname $(type -tP $i))" -done - - -serviceDir=$out/types/apache-httpd -ensureDir $serviceDir - - -doSub $conf $serviceDir/conf/subversion.conf -doSub $confPre $serviceDir/conf-pre/subversion.conf - -orgLogoUrl=$(stripHash $orgLogoFile; echo $strippedName) - -subDir=/ -for i in $scripts; do - if test "$(echo $i | cut -c1-2)" = "=>"; then - subDir=$(echo $i | cut -c3-) - else - dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//') - doSub $i $dst - chmod +x $dst # !!! - fi -done - -subDir=/ -for i in $staticPages; do - if test "$(echo $i | cut -c1-2)" = "=>"; then - subDir=$(echo $i | cut -c3-) - else - ensureDir $out/static-pages/$subDir/ - cp $i $out/static-pages/$subDir/$(stripHash $i; echo $strippedName) - fi -done - -# !!! hack -ln -s $out/hooks/post-commit $out/bin/post-commit-hook - -# mod_python's own Python modules must be in the initial Python path, -# they cannot be set through the PythonPath directive. -echo "PYTHONPATH=$mod_python/lib/python2.4/site-packages" > $serviceDir/extra-env Deleted: services/trunk/subversion/default.nix =================================================================== --- services/trunk/subversion/default.nix 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/subversion/default.nix 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,107 +0,0 @@ -{ pkgs -, user, group -, reposDir, dbDir, logDir, distsDir, backupsDir, tmpDir -, canonicalName -, adminAddr, notificationSender, userCreationDomain -, fsType ? "fsfs" -, autoVersioning ? false -, orgName ? "Universiteit Utrecht" -, orgLogoFile ? ./root/UU_merk.gif -, orgUrl ? "http://www.cs.uu.nl/"; -, smtpHost ? "localhost" - - # warning: this default will *not* install the robots.txt - # file in the right place. -, staticPrefix ? "/repoman-files" -}: - -let - - # Build the Subversion service. - svnServer = pkgs.stdenv.mkDerivation { - name = "svn-server"; - builder = ./builder.sh; - - conf = ./subversion.conf; - confPre = ./subversion-pre.conf; - - defaultPath = "/no-path"; - - scripts = [ - "=>/types/apache-httpd" - ./startup-hook.sh - "=>/bin" - ./src/maintenance/create-user.pl.in - ./src/maintenance/delete-repo.pl.in - ./src/maintenance/delete-user.pl.in - ./src/maintenance/reload.in - ./src/maintenance/resetpw.pl.in - "=>/cgi-bin" - ./src/repoman/repoman.pl.in - "=>/hooks" - ./src/hooks/commit-email.pl.in - ./src/hooks/post-commit.in - ./src/hooks/hot-backup.pl.in - ./src/hooks/create-tarballs.pl.in - ./src/hooks/query-head-revision.xsl # !!! not actually an executable - ]; - - inherit staticPrefix; - staticPages = [ - "=>/" - ./root/favicon.ico ./root/robots.txt ./root/style.css orgLogoFile - "=>/xsl" - ./root/xsl/svnindex.xsl ./root/xsl/svnindex.css - ]; - - autoVersioning = if autoVersioning then "on" else "off"; - - inherit user group reposDir dbDir logDir distsDir backupsDir - tmpDir canonicalName adminAddr notificationSender userCreationDomain fsType - subversion authModules viewvc websvn - orgLogoFile orgUrl orgName smtpHost; - orgLogoUrl = orgUrl; # !!! hack to convince substiteAll to replace this. - - inherit (pkgs) perlBerkeleyDB python apacheHttpd mod_python - libxslt enscript db4; - php = pkgs.phpOld; - perl = pkgs.perl + "/bin/perl"; - # Urgh, most of these are dependencies of Email::Send, should figure them out automatically. - perlFlags = "-I${pkgs.perlBerkeleyDB}/lib/site_perl -I${pkgs.perlEmailSend}/lib/site_perl -I${pkgs.perlEmailSimple}/lib/site_perl -I${pkgs.perlModulePluggable}/lib/site_perl -I${pkgs.perlReturnValue}/lib/site_perl -I${pkgs.perlEmailAddress}/lib/site_perl"; - }; - - - # Build a Subversion instance with Apache modules and Swig/Python bindings. - subversion = import ../../nixpkgs/pkgs/applications/version-management/subversion-1.4.x { - inherit (pkgs) fetchurl stdenv apr aprutil neon expat swig zlib; - bdbSupport = true; - httpServer = true; - sslSupport = true; - compressionSupport = true; - pythonBindings = true; - httpd = pkgs.apacheHttpd; - }; - - - # Build our custom authentication modules. - authModules = import ./src/auth { - inherit (pkgs) stdenv apacheHttpd; - }; - - - # Build ViewVC. - viewvc = import ./src/viewvc { - inherit (pkgs) fetchurl stdenv python; - inherit reposDir adminAddr subversion; - }; - - - # Build WebSVN. - websvn = import ./src/websvn { - inherit (pkgs) fetchurl stdenv writeText enscript gnused; - inherit reposDir subversion; - cacheDir = tmpDir; - }; - - -in svnServer Deleted: services/trunk/subversion/subversion-pre.conf =================================================================== --- services/trunk/subversion/subversion-pre.conf 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/subversion/subversion-pre.conf 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,7 +0,0 @@ -# Allow anonymous access to repositories that are world-readable -# without prompting for a username/password. -LoadModule authn_noauth_module @authModules@/modules/mod_authn_noauth.so - -# Check whether the user is allowed read or write access to a -# repository. -LoadModule authz_dyn_module @authModules@/modules/mod_authz_dyn.so Deleted: services/trunk/subversion/subversion.conf =================================================================== --- services/trunk/subversion/subversion.conf 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/subversion/subversion.conf 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,193 +0,0 @@ -LoadModule python_module @mod_python@/modules/mod_python.so -LoadModule php5_module @php@/modules/libphp5.so -LoadModule dav_svn_module @subversion@/modules/mod_dav_svn.so - -AddType application/x-httpd-php .php .phtml - - -<AuthnProviderAlias dbm auth-against-db> - AuthDBMType DB - AuthDBMUserFile @dbDir@/svn-users -</AuthnProviderAlias> - -Alias @staticPrefix@ @out@/static-pages -<Directory @out@/static-pages> - Order allow,deny - Allow from all - AllowOverride None -</Directory> - -<Location /repos> # keep synched with /repos-xml! - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - - AuthAllowNone on - - AuthzRepoPrefix /repos/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - AuthzRepoWriters @dbDir@/svn-writers - - <LimitExcept GET PROPFIND OPTIONS REPORT> - Require repo-writer - </LimitExcept> - - <Limit GET PROPFIND OPTIONS REPORT> - Require repo-reader - </Limit> - - DAV svn - SVNParentPath @reposDir@ - SVNAutoversioning @autoVersioning@ -</Location> - - -<Location /repos-xml> # keep synched with /repos! - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - - AuthAllowNone on - - AuthzRepoPrefix /repos-xml/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - AuthzRepoWriters @dbDir@/svn-writers - - <LimitExcept GET PROPFIND OPTIONS REPORT> - Require repo-writer - </LimitExcept> - - <Limit GET PROPFIND OPTIONS REPORT> - Require repo-reader - </Limit> - - DAV svn - SVNParentPath @reposDir@ - - SVNIndexXSLT "@staticPrefix@/xsl/svnindex.xsl" -</Location> - - -ScriptAlias /repoman @out@/cgi-bin/repoman.pl - -<Location /repoman/listdetails> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - Require valid-user -</Location> - -<Location /repoman/adduser> - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from @userCreationDomain@ -</Location> - -<Location /repoman/edituser> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - Require valid-user -</Location> - -<Location /repoman/create> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - Require valid-user - - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from @userCreationDomain@ -</Location> - -<Location /repoman/update> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - Require valid-user -</Location> - -<Location /repoman/dump> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - AuthAllowNone on - AuthzRepoPrefix /repoman/dump/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - Require repo-reader -</Location> - -ScriptAlias /viewvc @viewvc@/viewvc/bin/mod_python/viewvc.py - -<Location /viewvc> - AddHandler python-program .py - PythonPath "['@viewvc@/viewvc/bin/mod_python', '@viewvc@/viewvc/lib', '@subversion@/lib/python2.4/site-packages']+sys.path" - PythonHandler handler - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - AuthAllowNone on - AuthzRepoPrefix /viewvc/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - Require repo-reader -</Location> - -Alias /viewvc-doc @viewvc@/viewvc/templates/docroot - -Redirect permanent /viewcvs @canonicalName@/viewvc - - -Alias /websvn @websvn@/wsvn.php -Alias /templates @websvn@/templates - -<Location /websvn> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - AuthAllowNone on - AuthzRepoPrefix /websvn/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - Require repo-reader -</Location> - - -Alias /dist @distsDir@ - -<Directory "@distsDir@"> - AllowOverride None - Options Indexes FollowSymLinks - Order allow,deny - Allow from all - IndexOptions +SuppressDescription +NameWidth=* - IndexIgnore *.rev *.lock -</Directory> - -<Location /dist> - AuthType Basic - AuthName "Subversion repositories" - AuthBasicProvider auth-against-db - AuthAllowNone on - AuthzRepoPrefix /dist/ - AuthzRepoDBType DB - AuthzRepoReaders @dbDir@/svn-readers - Require repo-reader -</Location> - - -#Alias /usage "@USAGE@/" - -#<Directory "@USAGE@"> -# Order allow,deny -# Allow from all -#</Directory> - - -Alias /robots.txt @out@/static-pages/robots.txt Deleted: services/trunk/upgrade-server.sh =================================================================== --- services/trunk/upgrade-server.sh 2010-07-08 13:25:52 UTC (rev 22529) +++ services/trunk/upgrade-server.sh 2010-07-08 13:34:34 UTC (rev 22530) @@ -1,36 +0,0 @@ -#! /bin/sh -e - -serverName=$1 -nixExpr=$2 -type=$3 -if test "$type" != "test" -a "$type" != "production"; then - echo "syntax: $0 NAME NIX-EXPR {test | production}" - exit 1 -fi - -profiles=/nix/var/nix/profiles -profileName=$serverName-$type-server - -if test "$type" = "test"; then - isProduction=false -else - isProduction=true -fi - -# Build and install the new server. -oldServer=$(readlink -f $profiles/$profileName || true) - -echo "building new server..." -nix-env -K -p $profiles/$profileName -f "$nixExpr" \ - --set --arg productionServer "$isProduction" \* - -# Stop the old server. -if test -n "$oldServer"; then - echo "stopping old server..." - $oldServer/bin/control stop || true - sleep 2 # Hack! -fi - -# Start the new server. -echo "starting new server..." -$profiles/$profileName/bin/control start _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
