diff --git a/munin/publik_count b/munin/publik_count index 16d217a..9d93fce 100755 --- a/munin/publik_count +++ b/munin/publik_count @@ -5,8 +5,17 @@ import os import psycopg2 import sys +base_dir = None +for dirname in os.listdir('/var/lib/machines/'): + if os.path.exists(os.path.join('/var/lib/machines/', dirname, 'var/lib/wcs')): + base_dir = os.path.join('/var/lib/machines/', dirname, 'var/lib/wcs') + break + if len(sys.argv) == 2 and sys.argv[1] == 'autoconf': - print 'yes' + if base_dir: + print 'yes' + else: + print 'no' sys.exit(0) if len(sys.argv) == 2 and sys.argv[1] == 'config': @@ -17,7 +26,7 @@ count.label Count sys.exit(0) total = 0 -base_dir = '/var/lib/machines/wcs.rbx.prod.entrouvert.org/var/lib/wcs/' + for tenant in os.listdir(base_dir): if tenant in ('collectstatic', 'scripts', 'skeletons'): continue