Packaging fixes

This commit is contained in:
Lauri Võsandi 2018-05-17 20:18:19 +00:00
parent 5565446b51
commit 6299d468c0
14 changed files with 22 additions and 9 deletions

View File

@ -12,7 +12,18 @@ include certidude/templates/server/*.conf
include certidude/static/js/*.js
include certidude/static/css/*.css
include certidude/static/fonts/*.woff2
include certidude/static/img/*.svg
include certidude/static/img/*.png
include certidude/static/views/*.html
include certidude/static/snippets/*.sh
include certidude/static/snippets/*.yml
include certidude/static/snippets/*.mobileconfig
include certidude/static/snippets/*.conf
include certidude/static/snippets/*.ps1
include certidude/static/*.html
include certidude/static/robots.txt
include certidude/sql/*/*.sql
include certidude/builder/overlay/usr/bin/certidude-*
include certidude/builder/overlay/etc/uci-defaults/*
include certidude/builder/overlay/etc/hotplug.d/iface/50-certidude
include certidude/builder/overlay/etc/profile
include certidude/builder/*.sh

View File

@ -0,0 +1,3 @@
#!/bin/sh
echo /etc/certidude/authority/ >> /etc/sysupgrade.conf

View File

@ -1123,10 +1123,15 @@ def certidude_setup_authority(username, kerberos_keytab, nginx_config, tls_confi
if os.path.exists(kerberos_keytab):
click.echo("Service principal keytab found in '%s'" % kerberos_keytab)
else:
click.echo("To use 'kerberos' authentication backend join the domain and create service principal with:")
click.echo("To use 'kerberos' authentication backend join the domain , create service principal and provision authority again:")
click.echo()
click.echo(" kinit administrator@EXAMPLE.LAN")
click.echo(" net ads join -k")
click.echo(" KRB5_KTNAME=FILE:%s net ads keytab add HTTP -P" % kerberos_keytab)
click.echo(" kdestroy")
click.echo(" chown %s %s" % (username, kerberos_keytab))
click.echo(" mv /etc/certidude/server.conf /etc/certidude/server.backup")
click.echo(" certidude setup authority")
click.echo()
@ -1152,7 +1157,7 @@ def certidude_setup_authority(username, kerberos_keytab, nginx_config, tls_confi
letsencrypt_privkey = "/etc/letsencrypt/live/%s/privkey.pem" % common_name
letsencrypt = os.path.exists(letsencrypt_fullchain)
doc_path = os.path.join(os.path.realpath(os.path.dirname(os.path.dirname(__file__))), "doc")
builder_path = os.path.join(os.path.realpath(os.path.dirname(__file__)), "builder")
script_dir = os.path.join(os.path.realpath(os.path.dirname(__file__)), "templates", "script")
static_path = os.path.join(os.path.realpath(os.path.dirname(__file__)), "static")

View File

@ -1,6 +0,0 @@
#!/bin/sh
echo $AUTHORITY_PATH >> /etc/sysupgrade.conf
echo $CERTIFICATE_PATH >> /etc/sysupgrade.conf
echo $KEY_PATH >> /etc/sysupgrade.conf
echo $REQUEST_PATH >> /etc/sysupgrade.conf