From ac4f4e2f4b7078e55a5997371ebd862326cea664 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 18 Jan 2010 15:46:52 +0000
Subject: [PATCH] reordering steps before moving stuff to PLCAPI

---
 plc.d/api        | 2 +-
 plc.d/db         | 2 +-
 plc.d/dns        | 2 +-
 plc.d/gpg        | 2 +-
 plc.d/httpd      | 2 +-
 plc.d/mail       | 2 +-
 plc.d/postgresql | 2 +-
 plc.d/ssh        | 2 +-
 plc.d/ssl        | 2 +-
 plc.init         | 3 ++-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plc.d/api b/plc.d/api
index c64937d..1b60930 100755
--- a/plc.d/api
+++ b/plc.d/api
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 450
+# priority: 800
 #
 # Configure the API. Must be done after SSL certificates are generated
 # and before the API web server is brought up.
diff --git a/plc.d/db b/plc.d/db
index 1fb2796..d10d648 100755
--- a/plc.d/db
+++ b/plc.d/db
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 800
+# priority: 900
 #
 # Bootstrap the database
 #
diff --git a/plc.d/dns b/plc.d/dns
index 1840f32..af4eba5 100755
--- a/plc.d/dns
+++ b/plc.d/dns
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 850
+# priority: 950
 #
 # Start local DNS server to provide minimal DNS forward resolution for
 # ourselves and our nodes.
diff --git a/plc.d/gpg b/plc.d/gpg
index 304b1ea..c69077f 100755
--- a/plc.d/gpg
+++ b/plc.d/gpg
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 500
+# priority: 400
 #
 # Generate GPG keys
 #
diff --git a/plc.d/httpd b/plc.d/httpd
index 76132b3..18b459a 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 700
+# priority: 600
 #
 # Configure Apache web server
 #
diff --git a/plc.d/mail b/plc.d/mail
index 01441b7..a90d5a8 100755
--- a/plc.d/mail
+++ b/plc.d/mail
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 250
+# priority: 200
 #
 # Start local mail server.
 #
diff --git a/plc.d/postgresql b/plc.d/postgresql
index 8b5739e..a3f5301 100755
--- a/plc.d/postgresql
+++ b/plc.d/postgresql
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 300
+# priority: 700
 #
 # Manage the PostgreSQL database server
 #
diff --git a/plc.d/ssh b/plc.d/ssh
index f667372..6707f0c 100755
--- a/plc.d/ssh
+++ b/plc.d/ssh
@@ -2,7 +2,7 @@
 # $Id$
 # $URL$
 #
-# priority: 600
+# priority: 500
 #
 # Generate SSH keys
 #
diff --git a/plc.d/ssl b/plc.d/ssl
index 2c8a4a4..8848349 100755
--- a/plc.d/ssl
+++ b/plc.d/ssl
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# priority: 400
+# priority: 300
 #
 # Generate SSL certificates
 #
diff --git a/plc.init b/plc.init
index 0617516..fc93b7e 100755
--- a/plc.init
+++ b/plc.init
@@ -35,10 +35,11 @@ verbose=0
 # but that's maybe a good thing, that all is done at first start
 ###
 
+# do not consider files that contain '.', '~' or 'functions' in the name
 steps=($(
 for step in /etc/plc.d/* ; do
     stepname=$(basename $step)
-    plainstepname=$(echo $stepname | sed -e 's,\.,,' -e 's,~,,')
+    plainstepname=$(echo $stepname | sed -e 's,\.,,' -e 's,~,,' -e 's,functions,,' )
     if [ -f $step -a -x $step -a "$stepname" = "$plainstepname" ] ; then
 	priority=$(sed -ne 's/# priority: \(.*\)/\1/p' $step)
 	echo $priority $stepname
-- 
2.43.0