Infra
/
cucchiaiata
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Emmanuel Garette 2020-08-05 09:42:13 +02:00
parent 4d81d4f5dd 58370148bc
commit 29f71266b3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
provisioning_example.sh
View File

@ -31,7 +31,7 @@ verif() {
for V in creole.reseau.unbound_route_address creole.reseau.unbound_domain_name creole.serveur_dns.unbound_local_zones creole.reseau.unbound_ip_address_cidr; do for V in creole.reseau.unbound_route_address creole.reseau.unbound_domain_name creole.serveur_dns.unbound_local_zones creole.reseau.unbound_ip_address_cidr; do
i=$((i+1)) i=$((i+1))
R=$(cucchiaiata-cli setting.session.$1.get -s $S -n $V | jq -Mcr .content[]) R=$(cucchiaiata-cli setting.session.$1.get -s $S -n $V | jq -Mcr .content[])
[ $R = "${argv[i]}" ] [ "$R" = "${argv[i]}" ]
done done
} }
@ -113,7 +113,7 @@ cucchiaiata-cli setting.template.generate -s dns.cadoles.com
cucchiaiata-cli setting.servermodel.dependency.add -m aca -a openssh -o cadoles -e last cucchiaiata-cli setting.servermodel.dependency.add -m aca -a openssh -o cadoles -e last
S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id) S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id)
R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[]) R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[])
[ $R = "[]" ] [ "$R" = "[]" ]
cucchiaiata-cli setting.session.server.stop -s $S cucchiaiata-cli setting.session.server.stop -s $S
S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id)
@ -122,7 +122,7 @@ cucchiaiata-cli setting.session.servermodel.stop -s $S -a
S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id) S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id)
R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[]) R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[])
[ $R = '["admin.cadoles.com"]' ] [ "$R" = '["admin.cadoles.com"]' ]
cucchiaiata-cli setting.session.server.stop -s $S cucchiaiata-cli setting.session.server.stop -s $S
# Regenerate configuration # Regenerate configuration

6
script/cucchiaiata-cli
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/python3
"""Zephir-cmd-input script """Zephir-cmd-input script
""" """
from sys import exit, argv from sys import exit, argv
@ -10,8 +10,8 @@ from cucchiaiata.i18n import _
def main(): def main():
try: try:
if argv[1] in ['setting.session.server.configure', if len(argv) > 2 and argv[1] in ['setting.session.server.configure',
'setting.session.servermodel.configure']: 'setting.session.servermodel.configure']:
Configuration().get() Configuration().get()
else: else:
parser = Parser() parser = Parser()

2
src/cucchiaiata/config.py
View File

@ -29,7 +29,7 @@ version: {version}"""
self.url = config['url'] self.url = config['url']
self.version = config['version'] self.version = config['version']
self.debug = 'debug' in config self.debug = config.get('debug', False)
self.remote_url = 'http://{}/api/{}'.format(self.url, self.version) self.remote_url = 'http://{}/api/{}'.format(self.url, self.version)
self.token_file = join(expanduser("~"), '.zephir-client.jwt.token') self.token_file = join(expanduser("~"), '.zephir-client.jwt.token')
self.indent = config.get('indent', 2) self.indent = config.get('indent', 2)