git://git.onelab.eu
/
nodeconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf5e46e
)
svn keywords, and url in specfile
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 28 Jan 2011 08:34:03 +0000
(09:34 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 28 Jan 2011 08:34:03 +0000
(09:34 +0100)
17 files changed:
Makefile
patch
|
blob
|
history
PlanetLabConf/get_gpg_key.php
patch
|
blob
|
history
PlanetLabConf/get_plc_config.php
patch
|
blob
|
history
PlanetLabConf/ipod.conf.php
patch
|
blob
|
history
PlanetLabConf/issue.php
patch
|
blob
|
history
PlanetLabConf/keys.php
patch
|
blob
|
history
PlanetLabConf/ntp.conf.php
patch
|
blob
|
history
PlanetLabConf/ntp/step-tickers.php
patch
|
blob
|
history
PlanetLabConf/sfa_config.php
patch
|
blob
|
history
db-config.d/030-conf_files_iptables
patch
|
blob
|
history
db-config.d/030-conf_files_kernel
patch
|
blob
|
history
db-config.d/030-conf_files_ping_of_death
patch
|
blob
|
history
db-config.d/030-conf_files_plc_config
patch
|
blob
|
history
db-config.d/030-conf_files_security
patch
|
blob
|
history
db-config.d/030-conf_files_services
patch
|
blob
|
history
db-config.d/030-conf_files_sfa
patch
|
blob
|
history
nodeconfig.spec
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
dce5ef7
..
cafde83
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,3
@@
-### $Id$
#
# how to push a working directoy to a running plc
#
#
# how to push a working directoy to a running plc
#
diff --git
a/PlanetLabConf/get_gpg_key.php
b/PlanetLabConf/get_gpg_key.php
index
42debe5
..
67c7065
100755
(executable)
--- a/
PlanetLabConf/get_gpg_key.php
+++ b/
PlanetLabConf/get_gpg_key.php
@@
-5,8
+5,6
@@
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
-// $Id$
-//
include 'plc_config.php';
include 'plc_config.php';
diff --git
a/PlanetLabConf/get_plc_config.php
b/PlanetLabConf/get_plc_config.php
index
3d83056
..
482c612
100755
(executable)
--- a/
PlanetLabConf/get_plc_config.php
+++ b/
PlanetLabConf/get_plc_config.php
@@
-6,8
+6,6
@@
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
-// $Id$
-//
// Try the new plc_config.php file first
include 'plc_config.php';
// Try the new plc_config.php file first
include 'plc_config.php';
diff --git
a/PlanetLabConf/ipod.conf.php
b/PlanetLabConf/ipod.conf.php
index
f0462d4
..
ed5c82a
100755
(executable)
--- a/
PlanetLabConf/ipod.conf.php
+++ b/
PlanetLabConf/ipod.conf.php
@@
-5,8
+5,6
@@
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2004-2006 The Trustees of Princeton University
//
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2004-2006 The Trustees of Princeton University
//
-// $Id$
-//
include('plc_config.php');
include('plc_config.php');
diff --git
a/PlanetLabConf/issue.php
b/PlanetLabConf/issue.php
index
be02d94
..
756d699
100755
(executable)
--- a/
PlanetLabConf/issue.php
+++ b/
PlanetLabConf/issue.php
@@
-5,8
+5,6
@@
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2004-2006 The Trustees of Princeton University
//
// Mark Huang <mlhuang@cs.princeton.edu>
// Copyright (C) 2004-2006 The Trustees of Princeton University
//
-// $Id$
-//
// For PLC_NAME, etc.
include('plc_config.php');
// For PLC_NAME, etc.
include('plc_config.php');
@@
-38,4
+36,4
@@
Console login to this node is restricted to site_admin.
EOF;
EOF;
-?>
\ No newline at end of file
+?>
diff --git
a/PlanetLabConf/keys.php
b/PlanetLabConf/keys.php
index
5fca766
..
c46c307
100755
(executable)
--- a/
PlanetLabConf/keys.php
+++ b/
PlanetLabConf/keys.php
@@
-13,8
+13,6
@@
// Aaron Klingaman <alk@cs.princeton.edu>
// Copyright (C) 2004 The Trustees of Princeton University
//
// Aaron Klingaman <alk@cs.princeton.edu>
// Copyright (C) 2004 The Trustees of Princeton University
//
-// $Id$
-//
// Get admin API handle
require_once 'plc_api.php';
// Get admin API handle
require_once 'plc_api.php';
diff --git
a/PlanetLabConf/ntp.conf.php
b/PlanetLabConf/ntp.conf.php
index
616d8a7
..
586e27b
100755
(executable)
--- a/
PlanetLabConf/ntp.conf.php
+++ b/
PlanetLabConf/ntp.conf.php
@@
-5,8
+5,6
@@
// Marc Fiuczynski <mef@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
// Marc Fiuczynski <mef@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
-// $Id$
-//
// Get admin API handle
require_once 'plc_api.php';
// Get admin API handle
require_once 'plc_api.php';
diff --git
a/PlanetLabConf/ntp/step-tickers.php
b/PlanetLabConf/ntp/step-tickers.php
index
7fc31ce
..
2efd704
100755
(executable)
--- a/
PlanetLabConf/ntp/step-tickers.php
+++ b/
PlanetLabConf/ntp/step-tickers.php
@@
-5,8
+5,6
@@
// Marc Fiuczynski <mef@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
// Marc Fiuczynski <mef@cs.princeton.edu>
// Copyright (C) 2006 The Trustees of Princeton University
//
-// $Id$
-//
// Get admin API handle
require_once 'plc_api.php';
// Get admin API handle
require_once 'plc_api.php';
diff --git
a/PlanetLabConf/sfa_config.php
b/PlanetLabConf/sfa_config.php
index
33d807b
..
e3e563d
100755
(executable)
--- a/
PlanetLabConf/sfa_config.php
+++ b/
PlanetLabConf/sfa_config.php
@@
-2,8
+2,6
@@
//
// SFA Component Manager configuration
//
//
// SFA Component Manager configuration
//
-// $Id:
-//
$config_directory = "/etc/sfa/";
$default_name = "sfa_component_config";
$config_directory = "/etc/sfa/";
$default_name = "sfa_component_config";
diff --git
a/db-config.d/030-conf_files_iptables
b/db-config.d/030-conf_files_iptables
index
66c155d
..
18a18e5
100644
(file)
--- a/
db-config.d/030-conf_files_iptables
+++ b/
db-config.d/030-conf_files_iptables
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_kernel
b/db-config.d/030-conf_files_kernel
index
8f9bb37
..
c1aea85
100644
(file)
--- a/
db-config.d/030-conf_files_kernel
+++ b/
db-config.d/030-conf_files_kernel
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_ping_of_death
b/db-config.d/030-conf_files_ping_of_death
index
79da0e4
..
c2da503
100644
(file)
--- a/
db-config.d/030-conf_files_ping_of_death
+++ b/
db-config.d/030-conf_files_ping_of_death
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_plc_config
b/db-config.d/030-conf_files_plc_config
index
da1eb49
..
2d7af61
100644
(file)
--- a/
db-config.d/030-conf_files_plc_config
+++ b/
db-config.d/030-conf_files_plc_config
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_security
b/db-config.d/030-conf_files_security
index
22d909d
..
7607fa0
100644
(file)
--- a/
db-config.d/030-conf_files_security
+++ b/
db-config.d/030-conf_files_security
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_services
b/db-config.d/030-conf_files_services
index
ef027d4
..
cca5b8b
100644
(file)
--- a/
db-config.d/030-conf_files_services
+++ b/
db-config.d/030-conf_files_services
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/db-config.d/030-conf_files_sfa
b/db-config.d/030-conf_files_sfa
index
5882461
..
de8d33b
100644
(file)
--- a/
db-config.d/030-conf_files_sfa
+++ b/
db-config.d/030-conf_files_sfa
@@
-1,6
+1,4
@@
# -*-python-*-
# -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
#################### conf files
conf_files = [
#################### conf files
conf_files = [
diff --git
a/nodeconfig.spec
b/nodeconfig.spec
index
c8a8336
..
16f2d6c
100644
(file)
--- a/
nodeconfig.spec
+++ b/
nodeconfig.spec
@@
-1,7
+1,4
@@
#
#
-# $Id$
-#
-%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
%define name nodeconfig
%define version 5.0
%define name nodeconfig
%define version 5.0
@@
-23,7
+20,7
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab %{plrelease}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab %{plrelease}
-URL: %
(echo %{url} | cut -d ' ' -f 2)
+URL: %
{SCMURL}
# We use set everywhere
Requires: php >= 5.0
# We use set everywhere
Requires: php >= 5.0