Compare commits
No commits in common. 'master' and 'gh-pages' have entirely different histories.
57 changed files with 7509 additions and 463 deletions
@ -1,6 +0,0 @@ |
|||||||
site/ |
|
||||||
letsencrypt/ |
|
||||||
letsencrypt_certs/ |
|
||||||
nginx.conf.default |
|
||||||
rojo.charlesreid1.com |
|
||||||
conf.d/http.subdomains.conf |
|
||||||
@ -1,3 +0,0 @@ |
|||||||
[submodule "mkdocs-material"] |
|
||||||
path = mkdocs-material |
|
||||||
url = https://git.charlesreid1.com/charlesreid1/mkdocs-material.git |
|
||||||
@ -1,18 +0,0 @@ |
|||||||
# d-nginx-subdomains |
|
||||||
|
|
||||||
This repo contains docker containers |
|
||||||
and a docker compose file for running |
|
||||||
an nginx web server for subdomain |
|
||||||
one-pagers. |
|
||||||
|
|
||||||
The services are just: |
|
||||||
* nginx |
|
||||||
|
|
||||||
## Links |
|
||||||
|
|
||||||
[documentation: d-nginx-subdomains container](https://pages.charlesreid1.com/d-nginx-subdomains/) (you are here) |
|
||||||
|
|
||||||
[source code on git.charlesreid1.com: d-nginx-subdomains](https://git.charlesreid1.com/docker/d-nginx-subdomains) |
|
||||||
|
|
||||||
[source code on github.com: charlesreid1-docker/d-nginx-subdomains](https://github.com/charlesreid1-docker/d-nginx-subdomains) |
|
||||||
|
|
||||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,13 @@ |
|||||||
|
/*! |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not |
||||||
|
* use this file except in compliance with the License. You may obtain a copy |
||||||
|
* of the License at: |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, SOFTWARE |
||||||
|
* DISTRIBUTED UNDER THE LICENSE IS DISTRIBUTED ON AN "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. |
||||||
|
* SEE THE LICENSE FOR THE SPECIFIC LANGUAGE GOVERNING PERMISSIONS AND |
||||||
|
* LIMITATIONS UNDER THE LICENSE. |
||||||
|
*/@font-face{font-family:"Material Icons";font-style:normal;font-weight:400;src:local("Material Icons"),local("MaterialIcons-Regular"),url("specimen/MaterialIcons-Regular.woff2") format("woff2"),url("specimen/MaterialIcons-Regular.woff") format("woff"),url("specimen/MaterialIcons-Regular.ttf") format("truetype")} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 521 B |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@ |
|||||||
|
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r,i,n;e.da=function(){this.pipeline.reset(),this.pipeline.add(e.da.trimmer,e.da.stopWordFilter,e.da.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.da.stemmer))},e.da.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.da.trimmer=e.trimmerSupport.generateTrimmer(e.da.wordCharacters),e.Pipeline.registerFunction(e.da.trimmer,"trimmer-da"),e.da.stemmer=(r=e.stemmerSupport.Among,i=e.stemmerSupport.SnowballProgram,n=new function(){var e,n,t,s=[new r("hed",-1,1),new r("ethed",0,1),new r("ered",-1,1),new r("e",-1,1),new r("erede",3,1),new r("ende",3,1),new r("erende",5,1),new r("ene",3,1),new r("erne",3,1),new r("ere",3,1),new r("en",-1,1),new r("heden",10,1),new r("eren",10,1),new r("er",-1,1),new r("heder",13,1),new r("erer",13,1),new r("s",-1,2),new r("heds",16,1),new r("es",16,1),new r("endes",18,1),new r("erendes",19,1),new r("enes",18,1),new r("ernes",18,1),new r("eres",18,1),new r("ens",16,1),new r("hedens",24,1),new r("erens",24,1),new r("ers",16,1),new r("ets",16,1),new r("erets",28,1),new r("et",-1,1),new r("eret",30,1)],o=[new r("gd",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1)],a=[new r("ig",-1,1),new r("lig",0,1),new r("elig",1,1),new r("els",-1,1),new r("løst",-1,2)],d=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],u=[239,254,42,3,0,0,0,0,0,0,0,0,0,0,0,0,16],c=new i;function l(){var e,r=c.limit-c.cursor;c.cursor>=n&&(e=c.limit_backward,c.limit_backward=n,c.ket=c.cursor,c.find_among_b(o,4)?(c.bra=c.cursor,c.limit_backward=e,c.cursor=c.limit-r,c.cursor>c.limit_backward&&(c.cursor--,c.bra=c.cursor,c.slice_del())):c.limit_backward=e)}this.setCurrent=function(e){c.setCurrent(e)},this.getCurrent=function(){return c.getCurrent()},this.stem=function(){var r,i=c.cursor;return function(){var r,i=c.cursor+3;if(n=c.limit,0<=i&&i<=c.limit){for(e=i;;){if(r=c.cursor,c.in_grouping(d,97,248)){c.cursor=r;break}if(c.cursor=r,r>=c.limit)return;c.cursor++}for(;!c.out_grouping(d,97,248);){if(c.cursor>=c.limit)return;c.cursor++}(n=c.cursor)<e&&(n=e)}}(),c.limit_backward=i,c.cursor=c.limit,function(){var e,r;if(c.cursor>=n&&(r=c.limit_backward,c.limit_backward=n,c.ket=c.cursor,e=c.find_among_b(s,32),c.limit_backward=r,e))switch(c.bra=c.cursor,e){case 1:c.slice_del();break;case 2:c.in_grouping_b(u,97,229)&&c.slice_del()}}(),c.cursor=c.limit,l(),c.cursor=c.limit,function(){var e,r,i,t=c.limit-c.cursor;if(c.ket=c.cursor,c.eq_s_b(2,"st")&&(c.bra=c.cursor,c.eq_s_b(2,"ig")&&c.slice_del()),c.cursor=c.limit-t,c.cursor>=n&&(r=c.limit_backward,c.limit_backward=n,c.ket=c.cursor,e=c.find_among_b(a,5),c.limit_backward=r,e))switch(c.bra=c.cursor,e){case 1:c.slice_del(),i=c.limit-c.cursor,l(),c.cursor=c.limit-i;break;case 2:c.slice_from("løs")}}(),c.cursor=c.limit,c.cursor>=n&&(r=c.limit_backward,c.limit_backward=n,c.ket=c.cursor,c.out_grouping_b(d,97,248)?(c.bra=c.cursor,t=c.slice_to(t),c.limit_backward=r,c.eq_v_b(t)&&c.slice_del()):c.limit_backward=r),!0}},function(e){return"function"==typeof e.update?e.update(function(e){return n.setCurrent(e),n.stem(),n.getCurrent()}):(n.setCurrent(e),n.stem(),n.getCurrent())}),e.Pipeline.registerFunction(e.da.stemmer,"stemmer-da"),e.da.stopWordFilter=e.generateStopWordFilter("ad af alle alt anden at blev blive bliver da de dem den denne der deres det dette dig din disse dog du efter eller en end er et for fra ham han hans har havde have hende hendes her hos hun hvad hvis hvor i ikke ind jeg jer jo kunne man mange med meget men mig min mine mit mod ned noget nogle nu når og også om op os over på selv sig sin sine sit skal skulle som sådan thi til ud under var vi vil ville vor være været".split(" ")),e.Pipeline.registerFunction(e.da.stopWordFilter,"stopWordFilter-da")}}); |
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@ |
|||||||
|
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.jp=function(){this.pipeline.reset(),this.pipeline.add(e.jp.stopWordFilter,e.jp.stemmer),r?this.tokenizer=e.jp.tokenizer:(e.tokenizer&&(e.tokenizer=e.jp.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.jp.tokenizer))};var t=new e.TinySegmenter;e.jp.tokenizer=function(n){if(!arguments.length||null==n||null==n)return[];if(Array.isArray(n))return n.map(function(t){return r?new e.Token(t.toLowerCase()):t.toLowerCase()});for(var i=n.toString().toLowerCase().replace(/^\s+/,""),o=i.length-1;o>=0;o--)if(/\S/.test(i.charAt(o))){i=i.substring(0,o+1);break}return t.segment(i).filter(function(e){return!!e}).map(function(t){return r?new e.Token(t):t})},e.jp.stemmer=function(e){return e},e.Pipeline.registerFunction(e.jp.stemmer,"stemmer-jp"),e.jp.wordCharacters="一二三四五六七八九十百千万億兆一-龠々〆ヵヶぁ-んァ-ヴーｱ-ﾝﾞa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.jp.stopWordFilter=function(t){if(-1===e.jp.stopWordFilter.stopWords.indexOf(r?t.toString():t))return t},e.jp.stopWordFilter=e.generateStopWordFilter("これ それ あれ この その あの ここ そこ あそこ こちら どこ だれ なに なん 何 私 貴方 貴方方 我々 私達 あの人 あのかた 彼女 彼 です あります おります います は が の に を で え から まで より も どの と し それで しかし".split(" ")),e.Pipeline.registerFunction(e.jp.stopWordFilter,"stopWordFilter-jp")}}); |
||||||
@ -0,0 +1 @@ |
|||||||
|
!function(e,i){"function"==typeof define&&define.amd?define(i):"object"==typeof exports?module.exports=i():i()(e.lunr)}(this,function(){return function(e){e.multiLanguage=function(){for(var i=Array.prototype.slice.call(arguments),t=i.join("-"),r="",n=[],s=[],p=0;p<i.length;++p)"en"==i[p]?(r+="\\w",n.unshift(e.stopWordFilter),n.push(e.stemmer),s.push(e.stemmer)):(r+=e[i[p]].wordCharacters,n.unshift(e[i[p]].stopWordFilter),n.push(e[i[p]].stemmer),s.push(e[i[p]].stemmer));var o=e.trimmerSupport.generateTrimmer(r);return e.Pipeline.registerFunction(o,"lunr-multi-trimmer-"+t),n.unshift(o),function(){this.pipeline.reset(),this.pipeline.add.apply(this.pipeline,n),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add.apply(this.searchPipeline,s))}}}}); |
||||||
@ -0,0 +1 @@ |
|||||||
|
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r,n,i;e.no=function(){this.pipeline.reset(),this.pipeline.add(e.no.trimmer,e.no.stopWordFilter,e.no.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.no.stemmer))},e.no.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.no.trimmer=e.trimmerSupport.generateTrimmer(e.no.wordCharacters),e.Pipeline.registerFunction(e.no.trimmer,"trimmer-no"),e.no.stemmer=(r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,i=new function(){var e,i,t=[new r("a",-1,1),new r("e",-1,1),new r("ede",1,1),new r("ande",1,1),new r("ende",1,1),new r("ane",1,1),new r("ene",1,1),new r("hetene",6,1),new r("erte",1,3),new r("en",-1,1),new r("heten",9,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",12,1),new r("s",-1,2),new r("as",14,1),new r("es",14,1),new r("edes",16,1),new r("endes",16,1),new r("enes",16,1),new r("hetenes",19,1),new r("ens",14,1),new r("hetens",21,1),new r("ers",14,1),new r("ets",14,1),new r("et",-1,1),new r("het",25,1),new r("ert",-1,3),new r("ast",-1,1)],o=[new r("dt",-1,-1),new r("vt",-1,-1)],s=[new r("leg",-1,1),new r("eleg",0,1),new r("ig",-1,1),new r("eig",2,1),new r("lig",2,1),new r("elig",4,1),new r("els",-1,1),new r("lov",-1,1),new r("elov",7,1),new r("slov",7,1),new r("hetslov",9,1)],a=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],m=[119,125,149,1],l=new n;this.setCurrent=function(e){l.setCurrent(e)},this.getCurrent=function(){return l.getCurrent()},this.stem=function(){var r,n,u,d,c=l.cursor;return function(){var r,n=l.cursor+3;if(i=l.limit,0<=n||n<=l.limit){for(e=n;;){if(r=l.cursor,l.in_grouping(a,97,248)){l.cursor=r;break}if(r>=l.limit)return;l.cursor=r+1}for(;!l.out_grouping(a,97,248);){if(l.cursor>=l.limit)return;l.cursor++}(i=l.cursor)<e&&(i=e)}}(),l.limit_backward=c,l.cursor=l.limit,function(){var e,r,n;if(l.cursor>=i&&(r=l.limit_backward,l.limit_backward=i,l.ket=l.cursor,e=l.find_among_b(t,29),l.limit_backward=r,e))switch(l.bra=l.cursor,e){case 1:l.slice_del();break;case 2:n=l.limit-l.cursor,l.in_grouping_b(m,98,122)?l.slice_del():(l.cursor=l.limit-n,l.eq_s_b(1,"k")&&l.out_grouping_b(a,97,248)&&l.slice_del());break;case 3:l.slice_from("er")}}(),l.cursor=l.limit,n=l.limit-l.cursor,l.cursor>=i&&(r=l.limit_backward,l.limit_backward=i,l.ket=l.cursor,l.find_among_b(o,2)?(l.bra=l.cursor,l.limit_backward=r,l.cursor=l.limit-n,l.cursor>l.limit_backward&&(l.cursor--,l.bra=l.cursor,l.slice_del())):l.limit_backward=r),l.cursor=l.limit,l.cursor>=i&&(d=l.limit_backward,l.limit_backward=i,l.ket=l.cursor,(u=l.find_among_b(s,11))?(l.bra=l.cursor,l.limit_backward=d,1==u&&l.slice_del()):l.limit_backward=d),!0}},function(e){return"function"==typeof e.update?e.update(function(e){return i.setCurrent(e),i.stem(),i.getCurrent()}):(i.setCurrent(e),i.stem(),i.getCurrent())}),e.Pipeline.registerFunction(e.no.stemmer,"stemmer-no"),e.no.stopWordFilter=e.generateStopWordFilter("alle at av bare begge ble blei bli blir blitt både båe da de deg dei deim deira deires dem den denne der dere deres det dette di din disse ditt du dykk dykkar då eg ein eit eitt eller elles en enn er et ett etter for fordi fra før ha hadde han hans har hennar henne hennes her hjå ho hoe honom hoss hossen hun hva hvem hver hvilke hvilken hvis hvor hvordan hvorfor i ikke ikkje ikkje ingen ingi inkje inn inni ja jeg kan kom korleis korso kun kunne kva kvar kvarhelst kven kvi kvifor man mange me med medan meg meget mellom men mi min mine mitt mot mykje ned no noe noen noka noko nokon nokor nokre nå når og også om opp oss over på samme seg selv si si sia sidan siden sin sine sitt sjøl skal skulle slik so som som somme somt så sånn til um upp ut uten var vart varte ved vere verte vi vil ville vore vors vort vår være være vært å".split(" ")),e.Pipeline.registerFunction(e.no.stopWordFilter,"stopWordFilter-no")}}); |
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@ |
|||||||
|
!function(r,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(r.lunr)}(this,function(){return function(r){r.stemmerSupport={Among:function(r,t,i,s){if(this.toCharArray=function(r){for(var t=r.length,i=new Array(t),s=0;s<t;s++)i[s]=r.charCodeAt(s);return i},!r&&""!=r||!t&&0!=t||!i)throw"Bad Among initialisation: s:"+r+", substring_i: "+t+", result: "+i;this.s_size=r.length,this.s=this.toCharArray(r),this.substring_i=t,this.result=i,this.method=s},SnowballProgram:function(){var r;return{bra:0,ket:0,limit:0,cursor:0,limit_backward:0,setCurrent:function(t){r=t,this.cursor=0,this.limit=t.length,this.limit_backward=0,this.bra=this.cursor,this.ket=this.limit},getCurrent:function(){var t=r;return r=null,t},in_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e<=s&&e>=i&&t[(e-=i)>>3]&1<<(7&e))return this.cursor++,!0}return!1},in_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e<=s&&e>=i&&t[(e-=i)>>3]&1<<(7&e))return this.cursor--,!0}return!1},out_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e>s||e<i)return this.cursor++,!0;if(!(t[(e-=i)>>3]&1<<(7&e)))return this.cursor++,!0}return!1},out_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e>s||e<i)return this.cursor--,!0;if(!(t[(e-=i)>>3]&1<<(7&e)))return this.cursor--,!0}return!1},eq_s:function(t,i){if(this.limit-this.cursor<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor+s)!=i.charCodeAt(s))return!1;return this.cursor+=t,!0},eq_s_b:function(t,i){if(this.cursor-this.limit_backward<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor-t+s)!=i.charCodeAt(s))return!1;return this.cursor-=t,!0},find_among:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=l;m<_.s_size;m++){if(n+l==u){f=-1;break}if(f=r.charCodeAt(n+l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){if(o>=(_=t[s]).s_size){if(this.cursor=n+_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n+_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},find_among_b:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit_backward,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=(m=t[a]).s_size-1-l;_>=0;_--){if(n-l==u){f=-1;break}if(f=r.charCodeAt(n-1-l)-m.s[_])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var m;if(o>=(m=t[s]).s_size){if(this.cursor=n-m.s_size,!m.method)return m.result;var b=m.method();if(this.cursor=n-m.s_size,b)return m.result}if((s=m.substring_i)<0)return 0}},replace_s:function(t,i,s){var e=s.length-(i-t),n=r.substring(0,t),u=r.substring(i);return r=n+s+u,this.limit+=e,this.cursor>=i?this.cursor+=e:this.cursor>t&&(this.cursor=t),e},slice_check:function(){if(this.bra<0||this.bra>this.ket||this.ket>this.limit||this.limit>r.length)throw"faulty slice operation"},slice_from:function(r){this.slice_check(),this.replace_s(this.bra,this.ket,r)},slice_del:function(){this.slice_from("")},insert:function(r,t,i){var s=this.replace_s(r,t,i);r<=this.bra&&(this.bra+=s),r<=this.ket&&(this.ket+=s)},slice_to:function(){return this.slice_check(),r.substring(this.bra,this.ket)},eq_v_b:function(r){return this.eq_s_b(r.length,r)}}}},r.trimmerSupport={generateTrimmer:function(r){var t=new RegExp("^[^"+r+"]+"),i=new RegExp("[^"+r+"]+$");return function(r){return"function"==typeof r.update?r.update(function(r){return r.replace(t,"").replace(i,"")}):r.replace(t,"").replace(i,"")}}}}}); |
||||||
@ -0,0 +1 @@ |
|||||||
|
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r,n,t;e.sv=function(){this.pipeline.reset(),this.pipeline.add(e.sv.trimmer,e.sv.stopWordFilter,e.sv.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sv.stemmer))},e.sv.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.sv.trimmer=e.trimmerSupport.generateTrimmer(e.sv.wordCharacters),e.Pipeline.registerFunction(e.sv.trimmer,"trimmer-sv"),e.sv.stemmer=(r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,t=new function(){var e,t,i=[new r("a",-1,1),new r("arna",0,1),new r("erna",0,1),new r("heterna",2,1),new r("orna",0,1),new r("ad",-1,1),new r("e",-1,1),new r("ade",6,1),new r("ande",6,1),new r("arne",6,1),new r("are",6,1),new r("aste",6,1),new r("en",-1,1),new r("anden",12,1),new r("aren",12,1),new r("heten",12,1),new r("ern",-1,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",18,1),new r("or",-1,1),new r("s",-1,2),new r("as",21,1),new r("arnas",22,1),new r("ernas",22,1),new r("ornas",22,1),new r("es",21,1),new r("ades",26,1),new r("andes",26,1),new r("ens",21,1),new r("arens",29,1),new r("hetens",29,1),new r("erns",21,1),new r("at",-1,1),new r("andet",-1,1),new r("het",-1,1),new r("ast",-1,1)],s=[new r("dd",-1,-1),new r("gd",-1,-1),new r("nn",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1),new r("tt",-1,-1)],a=[new r("ig",-1,1),new r("lig",0,1),new r("els",-1,1),new r("fullt",-1,3),new r("löst",-1,2)],o=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,24,0,32],u=[119,127,149],m=new n;this.setCurrent=function(e){m.setCurrent(e)},this.getCurrent=function(){return m.getCurrent()},this.stem=function(){var r,n=m.cursor;return function(){var r,n=m.cursor+3;if(t=m.limit,0<=n||n<=m.limit){for(e=n;;){if(r=m.cursor,m.in_grouping(o,97,246)){m.cursor=r;break}if(m.cursor=r,m.cursor>=m.limit)return;m.cursor++}for(;!m.out_grouping(o,97,246);){if(m.cursor>=m.limit)return;m.cursor++}(t=m.cursor)<e&&(t=e)}}(),m.limit_backward=n,m.cursor=m.limit,function(){var e,r=m.limit_backward;if(m.cursor>=t&&(m.limit_backward=t,m.cursor=m.limit,m.ket=m.cursor,e=m.find_among_b(i,37),m.limit_backward=r,e))switch(m.bra=m.cursor,e){case 1:m.slice_del();break;case 2:m.in_grouping_b(u,98,121)&&m.slice_del()}}(),m.cursor=m.limit,r=m.limit_backward,m.cursor>=t&&(m.limit_backward=t,m.cursor=m.limit,m.find_among_b(s,7)&&(m.cursor=m.limit,m.ket=m.cursor,m.cursor>m.limit_backward&&(m.bra=--m.cursor,m.slice_del())),m.limit_backward=r),m.cursor=m.limit,function(){var e,r;if(m.cursor>=t){if(r=m.limit_backward,m.limit_backward=t,m.cursor=m.limit,m.ket=m.cursor,e=m.find_among_b(a,5))switch(m.bra=m.cursor,e){case 1:m.slice_del();break;case 2:m.slice_from("lös");break;case 3:m.slice_from("full")}m.limit_backward=r}}(),!0}},function(e){return"function"==typeof e.update?e.update(function(e){return t.setCurrent(e),t.stem(),t.getCurrent()}):(t.setCurrent(e),t.stem(),t.getCurrent())}),e.Pipeline.registerFunction(e.sv.stemmer,"stemmer-sv"),e.sv.stopWordFilter=e.generateStopWordFilter("alla allt att av blev bli blir blivit de dem den denna deras dess dessa det detta dig din dina ditt du där då efter ej eller en er era ert ett från för ha hade han hans har henne hennes hon honom hur här i icke ingen inom inte jag ju kan kunde man med mellan men mig min mina mitt mot mycket ni nu när någon något några och om oss på samma sedan sig sin sina sitta själv skulle som så sådan sådana sådant till under upp ut utan vad var vara varför varit varje vars vart vem vi vid vilka vilkas vilken vilket vår våra vårt än är åt över".split(" ")),e.Pipeline.registerFunction(e.sv.stopWordFilter,"stopWordFilter-sv")}}); |
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,6 +0,0 @@ |
|||||||
# https://serverfault.com/a/525011 |
|
||||||
server { |
|
||||||
server_name _; |
|
||||||
listen *:80 default_server deferred; |
|
||||||
return 444; |
|
||||||
} |
|
||||||
@ -1 +0,0 @@ |
|||||||
allow {{ nginx_charlesreid1_ip }}; |
|
||||||
@ -1,69 +0,0 @@ |
|||||||
#################### |
|
||||||
# |
|
||||||
# charlesreid1 subdomains |
|
||||||
# (this is http only) |
|
||||||
# (the https happens in pod-charlesreid1) |
|
||||||
# (this happens in pod-webhooks) |
|
||||||
# |
|
||||||
# We use a client-allow.conf to block all IPs |
|
||||||
# except for the IP of the machine running |
|
||||||
# pod-charlesreid1. This is because this pod |
|
||||||
# is reverse-proxied by the machine running |
|
||||||
# pod-charlesreid1. |
|
||||||
# |
|
||||||
# Binding to a private ip happens |
|
||||||
# at the docker level, not the nginx level. |
|
||||||
# |
|
||||||
# 7777 pages.{{ server_name_default }} |
|
||||||
# 7778 hooks.{{ server_name_default }} |
|
||||||
# 7779 bots.{{ server_name_default }} |
|
||||||
# |
|
||||||
#################### |
|
||||||
|
|
||||||
server { |
|
||||||
listen 7777; |
|
||||||
listen [::]:7777; |
|
||||||
server_name pages.{{ server_name_default }}; |
|
||||||
## Only allow IPs in client-allow.conf |
|
||||||
#include /etc/nginx/conf.d/client-allow.conf; |
|
||||||
#deny all; |
|
||||||
port_in_redirect off; |
|
||||||
location / { |
|
||||||
index index.html; |
|
||||||
try_files $uri $uri/ $uri/index.html =404; |
|
||||||
root /www/pages.{{ server_name_default }}/htdocs; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
server { |
|
||||||
listen 7778; |
|
||||||
listen [::]:7778; |
|
||||||
server_name hooks.{{ server_name_default }}; |
|
||||||
## Only allow IPs in client-allow.conf |
|
||||||
#include /etc/nginx/conf.d/client-allow.conf; |
|
||||||
#deny all; |
|
||||||
location / { |
|
||||||
index index.html; |
|
||||||
try_files $uri $uri/ $uri/index.html =404; |
|
||||||
root /www/hooks.{{ server_name_default }}/htdocs; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
server { |
|
||||||
listen 7779; |
|
||||||
listen [::]:7779; |
|
||||||
server_name bots.{{ server_name_default }}; |
|
||||||
## Only allow IPs in client-allow.conf |
|
||||||
#include /etc/nginx/conf.d/client-allow.conf; |
|
||||||
#deny all; |
|
||||||
location / { |
|
||||||
index index.html; |
|
||||||
try_files $uri $uri/ $uri/index.html =404; |
|
||||||
root /www/bots.{{ server_name_default }}/htdocs; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
@ -1,17 +0,0 @@ |
|||||||
version: "3.1" |
|
||||||
services: |
|
||||||
singleton_nginx_subs: |
|
||||||
restart: always |
|
||||||
image: nginx |
|
||||||
command: /bin/bash -c "nginx -g 'daemon off;'" |
|
||||||
volumes: |
|
||||||
- "./conf.d:/etc/nginx/conf.d" |
|
||||||
- "/www/pages.charlesreid1.com/htdocs:/www/pages.charlesreid1.com/htdocs:ro" |
|
||||||
- "/www/hooks.charlesreid1.com/htdocs:/www/hooks.charlesreid1.com/htdocs:ro" |
|
||||||
- "/www/bots.charlesreid1.com/htdocs:/www/bots.charlesreid1.com/htdocs:ro" |
|
||||||
ports: |
|
||||||
- "7777:7777" |
|
||||||
- "7778:7778" |
|
||||||
- "7779:7779" |
|
||||||
|
|
||||||
# https://docs.docker.com/compose/compose-file/#network_mode |
|
||||||
@ -1,174 +0,0 @@ |
|||||||
# d-nginx-subdomains |
|
||||||
|
|
||||||
This repo contains docker containers |
|
||||||
and a docker compose file for running |
|
||||||
an nginx web server for subdomain |
|
||||||
one-pagers. |
|
||||||
|
|
||||||
The services are just: |
|
||||||
|
|
||||||
* nginx |
|
||||||
|
|
||||||
This is also intended to be reverse proxied |
|
||||||
by another frontend nginx server, |
|
||||||
so this one-container pod will bind |
|
||||||
to a VPN IP address and establish |
|
||||||
(unecrypted) HTTP connections over the |
|
||||||
(encrypted) VPN connection. |
|
||||||
|
|
||||||
Pretty simple, right? |
|
||||||
|
|
||||||
# Networking |
|
||||||
|
|
||||||
The setup for this one-container docker pod |
|
||||||
is to have an nginx container bound to all |
|
||||||
addresses inside the container (see nginx.conf |
|
||||||
selection below) and then bind that port |
|
||||||
inside the container to a specific IP and port |
|
||||||
on the host (see docker-compose selection below). |
|
||||||
|
|
||||||
The nginx configuration file contains a listen |
|
||||||
directive that binds nginx to all addresses |
|
||||||
inside the container: |
|
||||||
|
|
||||||
``` |
|
||||||
server { |
|
||||||
listen *:7777; |
|
||||||
} |
|
||||||
``` |
|
||||||
|
|
||||||
Meanwhile, in the `docker-compose.yml` file, |
|
||||||
we bind the container's port 7777 to the |
|
||||||
host's port 7777, but only on a private |
|
||||||
IP address: |
|
||||||
|
|
||||||
``` |
|
||||||
servies: |
|
||||||
stormy_nginx_subs: |
|
||||||
... |
|
||||||
ports: |
|
||||||
- "10.5.0.2:7777:7777" |
|
||||||
``` |
|
||||||
|
|
||||||
|
|
||||||
# Config files |
|
||||||
|
|
||||||
All `*.conf` files in the `conf.d/` directory will be picked up by nginx. |
|
||||||
|
|
||||||
The config files must be named `*.conf`. |
|
||||||
|
|
||||||
|
|
||||||
# Volumes |
|
||||||
|
|
||||||
No data volumes are used. |
|
||||||
|
|
||||||
* nginx static content is a bind-mounted host directory |
|
||||||
* lets encrypt generates site certs, which will be bind-mounted into host directory |
|
||||||
|
|
||||||
Here is the volumes directive in `docker-compose.yml`: |
|
||||||
|
|
||||||
``` |
|
||||||
volumes: |
|
||||||
- "./conf.d:/etc/nginx/conf.d" |
|
||||||
- "/www/pages.charlesreid1.com/htdocs:/www/pages.charlesreid1.com/htdocs:ro" |
|
||||||
- "/www/hooks.charlesreid1.com/htdocs:/www/hooks.charlesreid1.com/htdocs:ro" |
|
||||||
- "/www/bots.charlesreid1.com/htdocs:/www/bots.charlesreid1.com/htdocs:ro" |
|
||||||
``` |
|
||||||
|
|
||||||
The first line sets the nginx config files, |
|
||||||
the rest set the static content locations. |
|
||||||
|
|
||||||
|
|
||||||
# Backups |
|
||||||
|
|
||||||
Site content comes from git.charlesreid1.com, |
|
||||||
nothing to back up. |
|
||||||
|
|
||||||
# Workflow |
|
||||||
|
|
||||||
## Static Content Directory Layout |
|
||||||
|
|
||||||
Directories with static content are bind-mounted |
|
||||||
read-only into the container. To update the content |
|
||||||
being served, just update the content directory |
|
||||||
on the host. |
|
||||||
|
|
||||||
(This enables you to use version control to |
|
||||||
track the live site contents.) |
|
||||||
|
|
||||||
The section below covers how accomplish this layout. |
|
||||||
You should have your web content laid out as follows |
|
||||||
on the host: |
|
||||||
|
|
||||||
``` |
|
||||||
/www |
|
||||||
example.com/ |
|
||||||
htdocs/ |
|
||||||
index.html |
|
||||||
... |
|
||||||
example.com-src/ |
|
||||||
README.md |
|
||||||
pelican/ |
|
||||||
... |
|
||||||
git/ |
|
||||||
<contents of .git dir> |
|
||||||
... |
|
||||||
|
|
||||||
example2.com/ |
|
||||||
htdocs/ |
|
||||||
... |
|
||||||
example2.com-src/ |
|
||||||
... |
|
||||||
git/ |
|
||||||
... |
|
||||||
``` |
|
||||||
|
|
||||||
In the container, you will have a mirrored directory |
|
||||||
structure, but only `htdocs`: |
|
||||||
|
|
||||||
``` |
|
||||||
/www |
|
||||||
example.com/ |
|
||||||
htdocs/ |
|
||||||
index.html |
|
||||||
... |
|
||||||
|
|
||||||
example2.com/ |
|
||||||
htdocs/ |
|
||||||
... |
|
||||||
``` |
|
||||||
|
|
||||||
|
|
||||||
## Deploying Static Content with Git |
|
||||||
|
|
||||||
You can use git to deploy static content, but take care |
|
||||||
not to put your `.git` directory into the live |
|
||||||
web directory. |
|
||||||
|
|
||||||
``` |
|
||||||
git clone \ |
|
||||||
--separate-git-dir=/www/example.com/git \ |
|
||||||
-b gh-pages \ |
|
||||||
<url-of-static-site> \ |
|
||||||
/www/example.com/htdocs |
|
||||||
``` |
|
||||||
|
|
||||||
Let's walk through that: |
|
||||||
|
|
||||||
* Clone command to deploy content fresh |
|
||||||
* Separate git dir to keep git from being live |
|
||||||
* Branch `gh-pages` (we decided to match Github's convention) |
|
||||||
* Url of static site from git.charlesreid1.com |
|
||||||
* The path of the final cloned repo (bind mounted into container) |
|
||||||
|
|
||||||
See scripts for details. |
|
||||||
|
|
||||||
## Updating Static Content with Git |
|
||||||
|
|
||||||
|
|
||||||
``` |
|
||||||
git \ |
|
||||||
--git-dir=/www/example.com/git \ |
|
||||||
--work-tree=/www/example.com/htdocs/reponame \ |
|
||||||
pull origin gh-pages |
|
||||||
``` |
|
||||||
@ -0,0 +1,452 @@ |
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!DOCTYPE html> |
||||||
|
<html lang="en" class="no-js"> |
||||||
|
<head> |
||||||
|
|
||||||
|
<meta charset="utf-8"> |
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1"> |
||||||
|
<meta http-equiv="x-ua-compatible" content="ie=edge"> |
||||||
|
|
||||||
|
|
||||||
|
<link rel="canonical" href="https://pages.charlesreid1.com/d-nginx-subdomains/"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<meta name="lang:clipboard.copy" content="Copy to clipboard"> |
||||||
|
|
||||||
|
<meta name="lang:clipboard.copied" content="Copied to clipboard"> |
||||||
|
|
||||||
|
<meta name="lang:search.language" content="en"> |
||||||
|
|
||||||
|
<meta name="lang:search.pipeline.stopwords" content="True"> |
||||||
|
|
||||||
|
<meta name="lang:search.pipeline.trimmer" content="True"> |
||||||
|
|
||||||
|
<meta name="lang:search.result.none" content="No matching documents"> |
||||||
|
|
||||||
|
<meta name="lang:search.result.one" content="1 matching document"> |
||||||
|
|
||||||
|
<meta name="lang:search.result.other" content="# matching documents"> |
||||||
|
|
||||||
|
<meta name="lang:search.tokenizer" content="[\s\-]+"> |
||||||
|
|
||||||
|
<link rel="shortcut icon" href="."> |
||||||
|
<meta name="generator" content="mkdocs-1.0, mkdocs-material-3.0.3"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<title>d-nginx-subdomains</title> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="assets/stylesheets/application.451f80e5.css"> |
||||||
|
|
||||||
|
<link rel="stylesheet" href="assets/stylesheets/application-palette.22915126.css"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<meta name="theme-color" content="#7cb342"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<script src="assets/javascripts/modernizr.1aa3b519.js"></script> |
||||||
|
|
||||||
|
|
||||||
|
<link href="https://fonts.gstatic.com" rel="preconnect" crossorigin> |
||||||
|
|
||||||
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,700|Roboto+Mono"> |
||||||
|
<style>body,input{font-family:"Roboto","Helvetica Neue",Helvetica,Arial,sans-serif}code,kbd,pre{font-family:"Roboto Mono","Courier New",Courier,monospace}</style> |
||||||
|
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="assets/fonts/material-icons.css"> |
||||||
|
|
||||||
|
<link rel="stylesheet" href="css/custom.css"> |
||||||
|
|
||||||
|
|
||||||
|
</head> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<body dir="ltr" data-md-color-primary="light-green" data-md-color-accent="light-green"> |
||||||
|
|
||||||
|
<svg class="md-svg"> |
||||||
|
<defs> |
||||||
|
|
||||||
|
|
||||||
|
</defs> |
||||||
|
</svg> |
||||||
|
<input class="md-toggle" data-md-toggle="drawer" type="checkbox" id="__drawer" autocomplete="off"> |
||||||
|
<input class="md-toggle" data-md-toggle="search" type="checkbox" id="__search" autocomplete="off"> |
||||||
|
<label class="md-overlay" data-md-component="overlay" for="__drawer"></label> |
||||||
|
|
||||||
|
<a href="#d-nginx-subdomains" tabindex="1" class="md-skip"> |
||||||
|
Skip to content |
||||||
|
</a> |
||||||
|
|
||||||
|
|
||||||
|
<header class="md-header" data-md-component="header"> |
||||||
|
<nav class="md-header-nav md-grid"> |
||||||
|
<div class="md-flex"> |
||||||
|
<div class="md-flex__cell md-flex__cell--shrink"> |
||||||
|
<a href="https://pages.charlesreid1.com/d-nginx-subdomains" title="d-nginx-subdomains" class="md-header-nav__button md-logo"> |
||||||
|
|
||||||
|
<i class="md-icon">input</i> |
||||||
|
|
||||||
|
</a> |
||||||
|
</div> |
||||||
|
<div class="md-flex__cell md-flex__cell--shrink"> |
||||||
|
<label class="md-icon md-icon--menu md-header-nav__button" for="__drawer"></label> |
||||||
|
</div> |
||||||
|
<div class="md-flex__cell md-flex__cell--stretch"> |
||||||
|
<div class="md-flex__ellipsis md-header-nav__title" data-md-component="title"> |
||||||
|
|
||||||
|
|
||||||
|
<span class="md-header-nav__topic"> |
||||||
|
d-nginx-subdomains |
||||||
|
</span> |
||||||
|
<span class="md-header-nav__topic"> |
||||||
|
Home |
||||||
|
</span> |
||||||
|
|
||||||
|
|
||||||
|
</div> |
||||||
|
</div> |
||||||
|
<div class="md-flex__cell md-flex__cell--shrink"> |
||||||
|
|
||||||
|
|
||||||
|
<label class="md-icon md-icon--search md-header-nav__button" for="__search"></label> |
||||||
|
|
||||||
|
<div class="md-search" data-md-component="search" role="dialog"> |
||||||
|
<label class="md-search__overlay" for="__search"></label> |
||||||
|
<div class="md-search__inner" role="search"> |
||||||
|
<form class="md-search__form" name="search"> |
||||||
|
<input type="text" class="md-search__input" name="query" placeholder="Search" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="query" data-md-state="active"> |
||||||
|
<label class="md-icon md-search__icon" for="__search"></label> |
||||||
|
<button type="reset" class="md-icon md-search__icon" data-md-component="reset" tabindex="-1"> |
||||||
|
 |
||||||
|
</button> |
||||||
|
</form> |
||||||
|
<div class="md-search__output"> |
||||||
|
<div class="md-search__scrollwrap" data-md-scrollfix> |
||||||
|
<div class="md-search-result" data-md-component="result"> |
||||||
|
<div class="md-search-result__meta"> |
||||||
|
Type to start searching |
||||||
|
</div> |
||||||
|
<ol class="md-search-result__list"></ol> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
|
||||||
|
</div> |
||||||
|
|
||||||
|
<div class="md-flex__cell md-flex__cell--shrink"> |
||||||
|
<div class="md-header-nav__source"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<a href="https://git.charlesreid1.com/docker/d-nginx-subdomains" title="Go to repository" class="md-source" data-md-source=""> |
||||||
|
|
||||||
|
<div class="md-source__repository"> |
||||||
|
d-nginx-subdomains |
||||||
|
</div> |
||||||
|
</a> |
||||||
|
|
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
</div> |
||||||
|
</nav> |
||||||
|
</header> |
||||||
|
|
||||||
|
<div class="md-container"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<main class="md-main"> |
||||||
|
<div class="md-main__inner md-grid" data-md-component="container"> |
||||||
|
|
||||||
|
|
||||||
|
<div class="md-sidebar md-sidebar--primary" data-md-component="navigation"> |
||||||
|
<div class="md-sidebar__scrollwrap"> |
||||||
|
<div class="md-sidebar__inner"> |
||||||
|
<nav class="md-nav md-nav--primary" data-md-level="0"> |
||||||
|
<label class="md-nav__title md-nav__title--site" for="__drawer"> |
||||||
|
<a href="https://pages.charlesreid1.com/d-nginx-subdomains" title="d-nginx-subdomains" class="md-nav__button md-logo"> |
||||||
|
|
||||||
|
<i class="md-icon">input</i> |
||||||
|
|
||||||
|
</a> |
||||||
|
d-nginx-subdomains |
||||||
|
</label> |
||||||
|
|
||||||
|
<div class="md-nav__source"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<a href="https://git.charlesreid1.com/docker/d-nginx-subdomains" title="Go to repository" class="md-source" data-md-source=""> |
||||||
|
|
||||||
|
<div class="md-source__repository"> |
||||||
|
d-nginx-subdomains |
||||||
|
</div> |
||||||
|
</a> |
||||||
|
|
||||||
|
</div> |
||||||
|
|
||||||
|
<ul class="md-nav__list" data-md-scrollfix> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<li class="md-nav__item md-nav__item--active"> |
||||||
|
|
||||||
|
<input class="md-toggle md-nav__toggle" data-md-toggle="toc" type="checkbox" id="__toc"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<a href="." title="Home" class="md-nav__link md-nav__link--active"> |
||||||
|
Home |
||||||
|
</a> |
||||||
|
|
||||||
|
</li> |
||||||
|
|
||||||
|
|
||||||
|
</ul> |
||||||
|
</nav> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
|
||||||
|
<div class="md-sidebar md-sidebar--secondary" data-md-component="toc"> |
||||||
|
<div class="md-sidebar__scrollwrap"> |
||||||
|
<div class="md-sidebar__inner"> |
||||||
|
|
||||||
|
<nav class="md-nav md-nav--secondary"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</nav> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
|
||||||
|
<div class="md-content"> |
||||||
|
<article class="md-content__inner md-typeset"> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<h1 id="d-nginx-subdomains">d-nginx-subdomains<a class="headerlink" href="#d-nginx-subdomains" title="Permanent link">¶</a></h1> |
||||||
|
<p>This repo contains docker containers |
||||||
|
and a docker compose file for running |
||||||
|
an nginx web server for subdomain |
||||||
|
one-pagers.</p> |
||||||
|
<p>The services are just:</p> |
||||||
|
<ul> |
||||||
|
<li>nginx</li> |
||||||
|
</ul> |
||||||
|
<p>This is also intended to be reverse proxied |
||||||
|
by another frontend nginx server, |
||||||
|
so this one-container pod will bind |
||||||
|
to a VPN IP address and establish |
||||||
|
(unecrypted) HTTP connections over the |
||||||
|
(encrypted) VPN connection.</p> |
||||||
|
<p>Pretty simple, right?</p> |
||||||
|
<h1 id="networking">Networking<a class="headerlink" href="#networking" title="Permanent link">¶</a></h1> |
||||||
|
<p>The setup for this one-container docker pod |
||||||
|
is to have an nginx container bound to all |
||||||
|
addresses inside the container (see nginx.conf |
||||||
|
selection below) and then bind that port |
||||||
|
inside the container to a specific IP and port |
||||||
|
on the host (see docker-compose selection below).</p> |
||||||
|
<p>The nginx configuration file contains a listen |
||||||
|
directive that binds nginx to all addresses |
||||||
|
inside the container:</p> |
||||||
|
<div class="codehilite"><pre><span></span>server { |
||||||
|
listen *:7777; |
||||||
|
} |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<p>Meanwhile, in the <code>docker-compose.yml</code> file, |
||||||
|
we bind the container's port 7777 to the |
||||||
|
host's port 7777, but only on a private |
||||||
|
IP address:</p> |
||||||
|
<div class="codehilite"><pre><span></span>servies: |
||||||
|
stormy_nginx_subs: |
||||||
|
... |
||||||
|
ports: |
||||||
|
- "10.5.0.2:7777:7777" |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<h1 id="config-files">Config files<a class="headerlink" href="#config-files" title="Permanent link">¶</a></h1> |
||||||
|
<p>All <code>*.conf</code> files in the <code>conf.d/</code> directory will be picked up by nginx.</p> |
||||||
|
<p>The config files must be named <code>*.conf</code>.</p> |
||||||
|
<h1 id="volumes">Volumes<a class="headerlink" href="#volumes" title="Permanent link">¶</a></h1> |
||||||
|
<p>No data volumes are used.</p> |
||||||
|
<ul> |
||||||
|
<li>nginx static content is a bind-mounted host directory</li> |
||||||
|
<li>lets encrypt generates site certs, which will be bind-mounted into host directory</li> |
||||||
|
</ul> |
||||||
|
<p>Here is the volumes directive in <code>docker-compose.yml</code>:</p> |
||||||
|
<div class="codehilite"><pre><span></span> volumes: |
||||||
|
- "./conf.d:/etc/nginx/conf.d" |
||||||
|
- "/www/pages.charlesreid1.com/htdocs:/www/pages.charlesreid1.com/htdocs:ro" |
||||||
|
- "/www/hooks.charlesreid1.com/htdocs:/www/hooks.charlesreid1.com/htdocs:ro" |
||||||
|
- "/www/bots.charlesreid1.com/htdocs:/www/bots.charlesreid1.com/htdocs:ro" |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<p>The first line sets the nginx config files, |
||||||
|
the rest set the static content locations.</p> |
||||||
|
<h1 id="backups">Backups<a class="headerlink" href="#backups" title="Permanent link">¶</a></h1> |
||||||
|
<p>Site content comes from git.charlesreid1.com, |
||||||
|
nothing to back up.</p> |
||||||
|
<h1 id="workflow">Workflow<a class="headerlink" href="#workflow" title="Permanent link">¶</a></h1> |
||||||
|
<h2 id="static-content-directory-layout">Static Content Directory Layout<a class="headerlink" href="#static-content-directory-layout" title="Permanent link">¶</a></h2> |
||||||
|
<p>Directories with static content are bind-mounted |
||||||
|
read-only into the container. To update the content |
||||||
|
being served, just update the content directory |
||||||
|
on the host.</p> |
||||||
|
<p>(This enables you to use version control to |
||||||
|
track the live site contents.)</p> |
||||||
|
<p>The section below covers how accomplish this layout. |
||||||
|
You should have your web content laid out as follows |
||||||
|
on the host:</p> |
||||||
|
<div class="codehilite"><pre><span></span>/www |
||||||
|
example.com/ |
||||||
|
htdocs/ |
||||||
|
index.html |
||||||
|
... |
||||||
|
example.com-src/ |
||||||
|
README.md |
||||||
|
pelican/ |
||||||
|
... |
||||||
|
git/ |
||||||
|
<contents of .git dir> |
||||||
|
... |
||||||
|
|
||||||
|
example2.com/ |
||||||
|
htdocs/ |
||||||
|
... |
||||||
|
example2.com-src/ |
||||||
|
... |
||||||
|
git/ |
||||||
|
... |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<p>In the container, you will have a mirrored directory |
||||||
|
structure, but only <code>htdocs</code>:</p> |
||||||
|
<div class="codehilite"><pre><span></span>/www |
||||||
|
example.com/ |
||||||
|
htdocs/ |
||||||
|
index.html |
||||||
|
... |
||||||
|
|
||||||
|
example2.com/ |
||||||
|
htdocs/ |
||||||
|
... |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<h2 id="deploying-static-content-with-git">Deploying Static Content with Git<a class="headerlink" href="#deploying-static-content-with-git" title="Permanent link">¶</a></h2> |
||||||
|
<p>You can use git to deploy static content, but take care |
||||||
|
not to put your <code>.git</code> directory into the live |
||||||
|
web directory.</p> |
||||||
|
<div class="codehilite"><pre><span></span>git clone \ |
||||||
|
--separate-git-dir=/www/example.com/git \ |
||||||
|
-b gh-pages \ |
||||||
|
<url-of-static-site> \ |
||||||
|
/www/example.com/htdocs |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
<p>Let's walk through that:</p> |
||||||
|
<ul> |
||||||
|
<li>Clone command to deploy content fresh</li> |
||||||
|
<li>Separate git dir to keep git from being live</li> |
||||||
|
<li>Branch <code>gh-pages</code> (we decided to match Github's convention)</li> |
||||||
|
<li>Url of static site from git.charlesreid1.com</li> |
||||||
|
<li>The path of the final cloned repo (bind mounted into container)</li> |
||||||
|
</ul> |
||||||
|
<p>See scripts for details.</p> |
||||||
|
<h2 id="updating-static-content-with-git">Updating Static Content with Git<a class="headerlink" href="#updating-static-content-with-git" title="Permanent link">¶</a></h2> |
||||||
|
<div class="codehilite"><pre><span></span>git \ |
||||||
|
--git-dir=/www/example.com/git \ |
||||||
|
--work-tree=/www/example.com/htdocs/reponame \ |
||||||
|
pull origin gh-pages |
||||||
|
</pre></div> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</article> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</main> |
||||||
|
|
||||||
|
|
||||||
|
<footer class="md-footer"> |
||||||
|
|
||||||
|
<div class="md-footer-meta md-typeset"> |
||||||
|
<div class="md-footer-meta__inner md-grid"> |
||||||
|
<div class="md-footer-copyright"> |
||||||
|
|
||||||
|
<div class="md-footer-copyright__highlight"> |
||||||
|
Copyright © 2018 <a href="https://charlesreid1.com">Charles Reid</a>, released under the <a href="https://opensource.org/licenses/MIT">MIT license</a> |
||||||
|
</div> |
||||||
|
|
||||||
|
powered by |
||||||
|
<a href="https://www.mkdocs.org">MkDocs</a> |
||||||
|
and |
||||||
|
<a href="https://squidfunk.github.io/mkdocs-material/"> |
||||||
|
Material for MkDocs</a> |
||||||
|
</div> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</footer> |
||||||
|
|
||||||
|
</div> |
||||||
|
|
||||||
|
<script src="assets/javascripts/application.e72fd936.js"></script> |
||||||
|
|
||||||
|
<script>app.initialize({version:"1.0",url:{base:"."}})</script> |
||||||
|
|
||||||
|
<script src="search/main.js"></script> |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</body> |
||||||
|
</html> |
||||||
@ -1,36 +0,0 @@ |
|||||||
site_name: d-nginx-subdomains |
|
||||||
site_url: https://pages.charlesreid1.com/d-nginx-subdomains |
|
||||||
repo_name: d-nginx-subdomains |
|
||||||
repo_url: https://git.charlesreid1.com/docker/d-nginx-subdomains |
|
||||||
edit_uri: "" |
|
||||||
|
|
||||||
copyright: 'Copyright © 2018 <a href="https://charlesreid1.com">Charles Reid</a>, released under the <a href="https://opensource.org/licenses/MIT">MIT license</a>' |
|
||||||
|
|
||||||
docs_dir: docs |
|
||||||
site_dir: site |
|
||||||
extra_css: |
|
||||||
- css/custom.css |
|
||||||
theme: |
|
||||||
name: null |
|
||||||
custom_dir: 'mkdocs-material/material' |
|
||||||
palette: |
|
||||||
primary: 'light green' |
|
||||||
accent: 'light green' |
|
||||||
logo: |
|
||||||
icon: 'input' |
|
||||||
font: |
|
||||||
text: 'Roboto' |
|
||||||
code: 'Roboto Mono' |
|
||||||
nav: |
|
||||||
- 'Home': 'index.md' |
|
||||||
|
|
||||||
# Extensions |
|
||||||
markdown_extensions: |
|
||||||
- admonition |
|
||||||
- codehilite: |
|
||||||
guess_lang: false |
|
||||||
- toc: |
|
||||||
permalink: true |
|
||||||
|
|
||||||
|
|
||||||
strict: true |
|
||||||
@ -1,30 +0,0 @@ |
|||||||
import glob |
|
||||||
import os |
|
||||||
import subprocess |
|
||||||
|
|
||||||
""" |
|
||||||
Clean d-nginx-subdomains conf.d directory |
|
||||||
|
|
||||||
|
|
||||||
This script cleans out the conf.d directory |
|
||||||
in the d-nginx-subdomains repo. |
|
||||||
|
|
||||||
This script should be run before you generate a new set |
|
||||||
of config files from the nginx config file templates in |
|
||||||
d-nginx-subdomains/conf.d_templates/ |
|
||||||
|
|
||||||
This script cleans out all the config files in the folder |
|
||||||
d-nginx-subdomains/conf.d/ |
|
||||||
|
|
||||||
That way there are no old config files to clash with the |
|
||||||
new ones. |
|
||||||
""" |
|
||||||
|
|
||||||
HERE = os.path.abspath(os.path.dirname(__file__)) |
|
||||||
CONF = os.path.abspath(os.path.join(HERE,'..','conf.d')) |
|
||||||
|
|
||||||
for f in glob.glob(os.path.join(CONF,"*.conf")): |
|
||||||
if os.path.basename(f)!="_.conf": |
|
||||||
cmd = ['rm','-fr',f] |
|
||||||
subprocess.call(cmd) |
|
||||||
|
|
||||||
@ -0,0 +1,94 @@ |
|||||||
|
function getSearchTermFromLocation() { |
||||||
|
var sPageURL = window.location.search.substring(1); |
||||||
|
var sURLVariables = sPageURL.split('&'); |
||||||
|
for (var i = 0; i < sURLVariables.length; i++) { |
||||||
|
var sParameterName = sURLVariables[i].split('='); |
||||||
|
if (sParameterName[0] == 'q') { |
||||||
|
return decodeURIComponent(sParameterName[1].replace(/\+/g, '%20')); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
function formatResult (location, title, summary) { |
||||||
|
return '<article><h3><a href="' + base_url + '/' + location + '">'+ title + '</a></h3><p>' + summary +'</p></article>'; |
||||||
|
} |
||||||
|
|
||||||
|
function displayResults (results) { |
||||||
|
var search_results = document.getElementById("mkdocs-search-results"); |
||||||
|
while (search_results.firstChild) { |
||||||
|
search_results.removeChild(search_results.firstChild); |
||||||
|
} |
||||||
|
if (results.length > 0){ |
||||||
|
for (var i=0; i < results.length; i++){ |
||||||
|
var result = results[i]; |
||||||
|
var html = formatResult(result.location, result.title, result.summary); |
||||||
|
search_results.insertAdjacentHTML('beforeend', html); |
||||||
|
} |
||||||
|
} else { |
||||||
|
search_results.insertAdjacentHTML('beforeend', "<p>No results found</p>"); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
function doSearch () { |
||||||
|
var query = document.getElementById('mkdocs-search-query').value; |
||||||
|
if (query.length > 2) { |
||||||
|
console.log('Searching with query: ' + query); |
||||||
|
if (!window.Worker) { |
||||||
|
displayResults(search(query)); |
||||||
|
} else { |
||||||
|
searchWorker.postMessage({query: query}); |
||||||
|
} |
||||||
|
} else { |
||||||
|
// Clear results for short queries
|
||||||
|
displayResults([]); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
function initSearch () { |
||||||
|
var search_input = document.getElementById('mkdocs-search-query'); |
||||||
|
if (search_input) { |
||||||
|
search_input.addEventListener("keyup", doSearch); |
||||||
|
} |
||||||
|
|
||||||
|
var term = getSearchTermFromLocation(); |
||||||
|
if (term) { |
||||||
|
search_input.value = term; |
||||||
|
doSearch(); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
function onWorkerMessage (e) { |
||||||
|
if (e.data.results) { |
||||||
|
var results = e.data.results; |
||||||
|
displayResults(results); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
if (!window.Worker) { |
||||||
|
console.log('Web Worker API not supported'); |
||||||
|
// load index in main thread
|
||||||
|
$.getScript(base_url + "/search/worker.js").done(function () { |
||||||
|
console.log('Loaded worker'); |
||||||
|
init(); |
||||||
|
}).fail(function (jqxhr, settings, exception) { |
||||||
|
console.error('Could not load worker.js'); |
||||||
|
}); |
||||||
|
} else { |
||||||
|
// Wrap search in a web worker
|
||||||
|
var searchWorker = new Worker(base_url + "/search/worker.js"); |
||||||
|
searchWorker.postMessage({init: true}); |
||||||
|
searchWorker.onmessage = onWorkerMessage; |
||||||
|
} |
||||||
|
|
||||||
|
$(function() { |
||||||
|
var search_input = document.getElementById('mkdocs-search-query'); |
||||||
|
if (search_input) { |
||||||
|
search_input.addEventListener("keyup", doSearch); |
||||||
|
} |
||||||
|
|
||||||
|
var term = getSearchTermFromLocation(); |
||||||
|
if (term) { |
||||||
|
search_input.value = term; |
||||||
|
doSearch(); |
||||||
|
} |
||||||
|
}); |
||||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,127 @@ |
|||||||
|
var base_path = 'function' === typeof importScripts ? '.' : '/search/'; |
||||||
|
var allowSearch = false; |
||||||
|
var index; |
||||||
|
var documents = {}; |
||||||
|
var lang = ['en']; |
||||||
|
var data; |
||||||
|
|
||||||
|
function getScript(script, callback) { |
||||||
|
console.log('Loading script: ' + script); |
||||||
|
$.getScript(base_path + script).done(function () { |
||||||
|
callback(); |
||||||
|
}).fail(function (jqxhr, settings, exception) { |
||||||
|
console.log('Error: ' + exception); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
function getScriptsInOrder(scripts, callback) { |
||||||
|
if (scripts.length === 0) { |
||||||
|
callback(); |
||||||
|
return; |
||||||
|
} |
||||||
|
getScript(scripts[0], function() { |
||||||
|
getScriptsInOrder(scripts.slice(1), callback); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
function loadScripts(urls, callback) { |
||||||
|
if( 'function' === typeof importScripts ) { |
||||||
|
importScripts.apply(null, urls); |
||||||
|
callback(); |
||||||
|
} else { |
||||||
|
getScriptsInOrder(urls, callback); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
function onJSONLoaded () { |
||||||
|
data = JSON.parse(this.responseText); |
||||||
|
var scriptsToLoad = ['lunr.js']; |
||||||
|
if (data.config && data.config.lang && data.config.lang.length) { |
||||||
|
lang = data.config.lang; |
||||||
|
} |
||||||
|
if (lang.length > 1 || lang[0] !== "en") { |
||||||
|
scriptsToLoad.push('lunr.stemmer.support.js'); |
||||||
|
if (lang.length > 1) { |
||||||
|
scriptsToLoad.push('lunr.multi.js'); |
||||||
|
} |
||||||
|
for (var i=0; i < lang.length; i++) { |
||||||
|
if (lang[i] != 'en') { |
||||||
|
scriptsToLoad.push(['lunr', lang[i], 'js'].join('.')); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
loadScripts(scriptsToLoad, onScriptsLoaded); |
||||||
|
} |
||||||
|
|
||||||
|
function onScriptsLoaded () { |
||||||
|
console.log('All search scripts loaded, building Lunr index...'); |
||||||
|
if (data.config && data.config.separator && data.config.separator.length) { |
||||||
|
lunr.tokenizer.separator = new RegExp(data.config.separator); |
||||||
|
} |
||||||
|
if (data.index) { |
||||||
|
index = lunr.Index.load(data.index); |
||||||
|
data.docs.forEach(function (doc) { |
||||||
|
documents[doc.location] = doc; |
||||||
|
}); |
||||||
|
console.log('Lunr pre-built index loaded, search ready'); |
||||||
|
} else { |
||||||
|
index = lunr(function () { |
||||||
|
if (lang.length === 1 && lang[0] !== "en" && lunr[lang[0]]) { |
||||||
|
this.use(lunr[lang[0]]); |
||||||
|
} else if (lang.length > 1) { |
||||||
|
this.use(lunr.multiLanguage.apply(null, lang)); // spread operator not supported in all browsers: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator#Browser_compatibility
|
||||||
|
} |
||||||
|
this.field('title'); |
||||||
|
this.field('text'); |
||||||
|
this.ref('location'); |
||||||
|
|
||||||
|
for (var i=0; i < data.docs.length; i++) { |
||||||
|
var doc = data.docs[i]; |
||||||
|
this.add(doc); |
||||||
|
documents[doc.location] = doc; |
||||||
|
} |
||||||
|
}); |
||||||
|
console.log('Lunr index built, search ready'); |
||||||
|
} |
||||||
|
allowSearch = true; |
||||||
|
} |
||||||
|
|
||||||
|
function init () { |
||||||
|
var oReq = new XMLHttpRequest(); |
||||||
|
oReq.addEventListener("load", onJSONLoaded); |
||||||
|
var index_path = base_path + '/search_index.json'; |
||||||
|
if( 'function' === typeof importScripts ){ |
||||||
|
index_path = 'search_index.json'; |
||||||
|
} |
||||||
|
oReq.open("GET", index_path); |
||||||
|
oReq.send(); |
||||||
|
} |
||||||
|
|
||||||
|
function search (query) { |
||||||
|
if (!allowSearch) { |
||||||
|
console.error('Assets for search still loading'); |
||||||
|
return; |
||||||
|
} |
||||||
|
|
||||||
|
var resultDocuments = []; |
||||||
|
var results = index.search(query); |
||||||
|
for (var i=0; i < results.length; i++){ |
||||||
|
var result = results[i]; |
||||||
|
doc = documents[result.ref]; |
||||||
|
doc.summary = doc.text.substring(0, 200); |
||||||
|
resultDocuments.push(doc); |
||||||
|
} |
||||||
|
return resultDocuments; |
||||||
|
} |
||||||
|
|
||||||
|
if( 'function' === typeof importScripts ) { |
||||||
|
onmessage = function (e) { |
||||||
|
if (e.data.init) { |
||||||
|
init(); |
||||||
|
} else if (e.data.query) { |
||||||
|
postMessage({ results: search(e.data.query) }); |
||||||
|
} else { |
||||||
|
console.error("Worker - Unrecognized message: " + e); |
||||||
|
} |
||||||
|
}; |
||||||
|
} |
||||||
@ -0,0 +1,8 @@ |
|||||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||||
|
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> |
||||||
|
<url> |
||||||
|
<loc>https://pages.charlesreid1.com/d-nginx-subdomains/</loc> |
||||||
|
<lastmod>2018-08-11</lastmod> |
||||||
|
<changefreq>daily</changefreq> |
||||||
|
</url> |
||||||
|
</urlset> |
||||||
Binary file not shown.
@ -1,48 +0,0 @@ |
|||||||
import subprocess |
|
||||||
import os |
|
||||||
from static_domains import onepagers |
|
||||||
|
|
||||||
if(os.geteuid()==0): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: This script should not be run as root.") |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
|
|
||||||
if( os.path.isdir('/www') is False ): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: The /www directory does not exist.") |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for name in onepagers: |
|
||||||
url = onepagers[name] |
|
||||||
|
|
||||||
basedir = os.path.join("/www",name) |
|
||||||
mkdircmd = ["mkdir","-p",basedir] |
|
||||||
clonecmd = ["git","-C",basedir,"clone","--separate-git-dir=git","-b","gh-pages",url,"htdocs"] |
|
||||||
|
|
||||||
if( os.path.isdir( os.path.join(basedir,"git") ) |
|
||||||
and os.path.isdir( os.path.join(basedir,"htdocs")) ): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: The directories /www/%s/git and /www/%s/htodcs"%(name,name)) |
|
||||||
print(" already exist. Use the static_update.py script instead. ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
print(" ") |
|
||||||
print("About to run the command:") |
|
||||||
print(" $ " + " ".join(clonecmd)) |
|
||||||
print(" ") |
|
||||||
response = input('Okay to proceed? (y/n) ') |
|
||||||
if(response=='y' or response=='Y' or response=='yes'): |
|
||||||
subprocess.call(mkdircmd) |
|
||||||
subprocess.call(clonecmd) |
|
||||||
|
|
||||||
@ -1,6 +0,0 @@ |
|||||||
onepagers = { |
|
||||||
'pages.charlesreid1.com' : 'https://git.charlesreid1.com/charlesreid1/pages.charlesreid1.com', |
|
||||||
'hooks.charlesreid1.com' : 'https://git.charlesreid1.com/charlesreid1/hooks.charlesreid1.com', |
|
||||||
'bots.charlesreid1.com' : 'https://git.charlesreid1.com/charlesreid1/bots.charlesreid1.com' |
|
||||||
} |
|
||||||
|
|
||||||
@ -1,47 +0,0 @@ |
|||||||
import subprocess |
|
||||||
import os |
|
||||||
from static_domains import onepagers |
|
||||||
|
|
||||||
if(os.geteuid()==0): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: This script should not be run as root.") |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
|
|
||||||
if( os.path.isdir('/www') is False ): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: The /www directory does not exist.") |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for name in onepagers: |
|
||||||
url = onepagers[name] |
|
||||||
|
|
||||||
basedir = os.path.join("/www",name) |
|
||||||
pullcmd = ["git","-C",basedir,"--git-dir=git","--work-tree=htdocs","pull","origin","gh-pages"] |
|
||||||
|
|
||||||
if( os.path.isdir( os.path.join(basedir,"git") is False ) |
|
||||||
or os.path.isdir( os.path.join(basedir,"htdocs")) is False ): |
|
||||||
print(" ") |
|
||||||
print(" ") |
|
||||||
print("ERROR: The directories /www/%s/git and /www/%s/htodcs"%(name,name)) |
|
||||||
print(" do not exist. Use the static_clone.py script instead. ") |
|
||||||
print(" ") |
|
||||||
exit(1) |
|
||||||
|
|
||||||
print(" ") |
|
||||||
print("About to run the command:") |
|
||||||
print(" $ " + " ".join(pullcmd)) |
|
||||||
print(" ") |
|
||||||
response = input('Okay to proceed? (y/n) ') |
|
||||||
if(response=='y' or response=='Y' or response=='yes'): |
|
||||||
subprocess.call(pullcmd) |
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in new issue