diff options
| -rw-r--r-- | .templates/base.html | 4 | ||||
| -rw-r--r-- | bliki.tf | 21 | ||||
| -rw-r--r-- | markdoc.yaml | 1 | ||||
| -rw-r--r-- | static/media/css/codehilite.css | 63 | ||||
| -rw-r--r-- | static/media/css/grimoire.css | 2 |
5 files changed, 86 insertions, 5 deletions
diff --git a/.templates/base.html b/.templates/base.html index 3682f72..6ce453d 100644 --- a/.templates/base.html +++ b/.templates/base.html @@ -22,6 +22,10 @@ rel="stylesheet" type="text/css" href="{{ make_relative('/media/css/grimoire.css') }}"> + <link + rel="stylesheet" + type="text/css" + href="{{ make_relative('/media/css/codehilite.css') }}"> </head> <body> @@ -67,7 +67,7 @@ resource "aws_acm_certificate" "bliki" { } resource "aws_route53_record" "bliki_validation" { - zone_id = "${data.terraform_remote_state.dns.zone_id}" + zone_id = "${data.terraform_remote_state.dns.grimoire_ca_zone_id}" ttl = 60 name = "${aws_acm_certificate.bliki.domain_validation_options.0.resource_record_name}" type = "${aws_acm_certificate.bliki.domain_validation_options.0.resource_record_type}" @@ -79,8 +79,8 @@ resource "aws_route53_record" "bliki_validation" { resource "aws_cloudfront_distribution" "bliki" { provider = "aws.cloudfront" - enabled = true - is_ipv6_enabled = true + enabled = true + is_ipv6_enabled = true aliases = ["grimoire.ca"] @@ -140,7 +140,7 @@ resource "aws_cloudfront_distribution" "bliki" { } } -resource "aws_route53_record" "bliki" { +resource "aws_route53_record" "bliki_ip4" { zone_id = "${data.terraform_remote_state.dns.grimoire_ca_zone_id}" name = "" type = "A" @@ -153,3 +153,16 @@ resource "aws_route53_record" "bliki" { } } +resource "aws_route53_record" "bliki_ip6" { + zone_id = "${data.terraform_remote_state.dns.grimoire_ca_zone_id}" + name = "" + type = "AAAA" + + alias { + name = "${aws_cloudfront_distribution.bliki.domain_name}" + zone_id = "${aws_cloudfront_distribution.bliki.hosted_zone_id}" + + evaluate_target_health = false + } +} + diff --git a/markdoc.yaml b/markdoc.yaml index 2f3d87a..148dc4b 100644 --- a/markdoc.yaml +++ b/markdoc.yaml @@ -5,5 +5,6 @@ use-default-static: false markdown: extensions: + - codehilite - extra - headerid diff --git a/static/media/css/codehilite.css b/static/media/css/codehilite.css new file mode 100644 index 0000000..fe2d5e0 --- /dev/null +++ b/static/media/css/codehilite.css @@ -0,0 +1,63 @@ +.codehilite .hll { background-color: #ffffcc } +.codehilite { background: #f8f8f8; } +.codehilite .c { color: #408080; font-style: italic } /* Comment */ +.codehilite .err { border: 1px solid #FF0000 } /* Error */ +.codehilite .k { color: #008000; font-weight: bold } /* Keyword */ +.codehilite .o { color: #666666 } /* Operator */ +.codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.codehilite .cp { color: #BC7A00 } /* Comment.Preproc */ +.codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */ +.codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */ +.codehilite .gd { color: #A00000 } /* Generic.Deleted */ +.codehilite .ge { font-style: italic } /* Generic.Emph */ +.codehilite .gr { color: #FF0000 } /* Generic.Error */ +.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.codehilite .gi { color: #00A000 } /* Generic.Inserted */ +.codehilite .go { color: #888888 } /* Generic.Output */ +.codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.codehilite .gs { font-weight: bold } /* Generic.Strong */ +.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.codehilite .gt { color: #0044DD } /* Generic.Traceback */ +.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.codehilite .kp { color: #008000 } /* Keyword.Pseudo */ +.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.codehilite .kt { color: #B00040 } /* Keyword.Type */ +.codehilite .m { color: #666666 } /* Literal.Number */ +.codehilite .s { color: #BA2121 } /* Literal.String */ +.codehilite .na { color: #7D9029 } /* Name.Attribute */ +.codehilite .nb { color: #008000 } /* Name.Builtin */ +.codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.codehilite .no { color: #880000 } /* Name.Constant */ +.codehilite .nd { color: #AA22FF } /* Name.Decorator */ +.codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.codehilite .nf { color: #0000FF } /* Name.Function */ +.codehilite .nl { color: #A0A000 } /* Name.Label */ +.codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.codehilite .nv { color: #19177C } /* Name.Variable */ +.codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.codehilite .w { color: #bbbbbb } /* Text.Whitespace */ +.codehilite .mb { color: #666666 } /* Literal.Number.Bin */ +.codehilite .mf { color: #666666 } /* Literal.Number.Float */ +.codehilite .mh { color: #666666 } /* Literal.Number.Hex */ +.codehilite .mi { color: #666666 } /* Literal.Number.Integer */ +.codehilite .mo { color: #666666 } /* Literal.Number.Oct */ +.codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */ +.codehilite .sc { color: #BA2121 } /* Literal.String.Char */ +.codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.codehilite .s2 { color: #BA2121 } /* Literal.String.Double */ +.codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */ +.codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.codehilite .sx { color: #008000 } /* Literal.String.Other */ +.codehilite .sr { color: #BB6688 } /* Literal.String.Regex */ +.codehilite .s1 { color: #BA2121 } /* Literal.String.Single */ +.codehilite .ss { color: #19177C } /* Literal.String.Symbol */ +.codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */ +.codehilite .vc { color: #19177C } /* Name.Variable.Class */ +.codehilite .vg { color: #19177C } /* Name.Variable.Global */ +.codehilite .vi { color: #19177C } /* Name.Variable.Instance */ +.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */ diff --git a/static/media/css/grimoire.css b/static/media/css/grimoire.css index 0de122c..06e5e04 100644 --- a/static/media/css/grimoire.css +++ b/static/media/css/grimoire.css @@ -5,7 +5,7 @@ body { line-height: 30px; } -code { +code, .codehilite pre { font-family: 'Menlo', monospace; font-size: 80%; } |