crans/cranspasswords
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.crans.org/git/cranspasswords

Browse source
This commit is contained in:
Daniel STAN 2012-10-12 18:07:27 +02:00
commit b123e50c14
3 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config.py
View file

@ -4,17 +4,6 @@
import os import os
servers = { servers = {
'perso': {
'server_cmd' : [ '/home/dstan/passwords/cranspasswords/cranspasswords-server.py'],
'user' : 'dstan' },
'debug': {
'server_cmd' : ['/usr/bin/ssh', 'localhost', \
'/home/dstan/crans/cranspasswords/cranspasswords-server.py'],
'user' : 'dstan' },
'debug2': {
'server_cmd':['/usr/bin/ssh', 'vo',\
'/home/dstan/cranspasswords/cranspasswords-server'],
'user' : 'dstan'},
'default': { 'default': {
'server_cmd': ['/usr/bin/ssh', 'vert.adm.crans.org',\ 'server_cmd': ['/usr/bin/ssh', 'vert.adm.crans.org',\
'/root/cranspasswords/cranspasswords-server'], '/root/cranspasswords/cranspasswords-server'],

2
cranspasswords-server
View file

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
sudo /home/dstan/cranspasswords/cranspasswords-server.py $* sudo /root/cranspasswords/cranspasswords-server.py $*

22
cranspasswords-server.py
View file

@ -2,8 +2,8 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
"""cranspasswords-server.py: Serveur pour cranspasswords""" """cranspasswords-server.py: Serveur pour cranspasswords"""
MYDIR = '/home/dstan/cranspasswords/' MYDIR = '/root/cranspasswords/'
STORE = MYDIR+'test/' STORE = MYDIR+'db/'
import glob import glob
import os import os
@ -20,7 +20,7 @@ if MYUID == 'root':
MYUID = os.environ['SUDO_USER'] MYUID = os.environ['SUDO_USER']
CRANSP_MAIL = "root@crans.org" CRANSP_MAIL = "root@crans.org"
DEST_MAIL = "dstan@crans.org" DEST_MAIL = "root@crans.org"
KEYS = { KEYS = {
"aza-vallina": ("Damien.Aza-Vallina@crans.org", None), "aza-vallina": ("Damien.Aza-Vallina@crans.org", None),
@ -40,11 +40,11 @@ KEYS = {
"samir": ("samir@crans.org", "41C2B76B"), "samir": ("samir@crans.org", "41C2B76B"),
"boilard": ("boilard@crans.org", "C39EB6F4"), "boilard": ("boilard@crans.org", "C39EB6F4"),
"cauderlier": ("cauderlier@crans.org",None), #Méchant pas beau "cauderlier": ("cauderlier@crans.org",None), #Méchant pas beau
"maioli": ("maioli@crans.org",None) #Bis (maybe 9E5026E8) "maioli": ("maioli@crans.org",None), #Bis (maybe 9E5026E8)
"legallic": ("legallic@crans.org", "3784CFC3"),
} }
RTC=[ RTC=[
"dandrimont",
"iffrig" "iffrig"
] ]
NOUNOUS=RTC+[ NOUNOUS=RTC+[
@ -61,16 +61,17 @@ NOUNOUS=RTC+[
"cauderlier", "cauderlier",
"maioli", "maioli",
"samir", "samir",
"boilard" "boilard",
"legallic",
] ]
CA=["becue","dstan","boilard"] CA=[]
ROLES = { ROLES = {
"ca": CA, "ca": CA,
"ca-w": CA, "ca-w": CA,
"nounous": NOUNOUS, "nounous": NOUNOUS,
"nounous-w": NOUNOUS #Or maybe RTC ? "nounous-w": NOUNOUS,
} }
@ -122,7 +123,10 @@ def getfile(filename):
filepath = getpath(filename) filepath = getpath(filename)
try: try:
return json.loads(open(filepath).read()) obj = json.loads(open(filepath).read())
if not validate(obj['roles']):
return False
return obj
except IOError: except IOError:
return False return False