obsidian sync stuyff
This commit is contained in:
parent
71116eddbc
commit
c0c8391339
5 changed files with 54 additions and 40 deletions
7
common/_containers/obsidian_sync.md
Normal file
7
common/_containers/obsidian_sync.md
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
docker run \
|
||||||
|
-e hostname=https://obsidiansync.joshuabell.xyz \
|
||||||
|
-e database=obsidian_sync \
|
||||||
|
-e username=obsidian_admin \
|
||||||
|
-e password=$REPLACE \
|
||||||
|
docker.io/oleduc/docker-obsidian-livesync-couchdb:master \
|
||||||
|
deno -A /scripts/generate_setupuri.ts
|
|
@ -47,8 +47,8 @@ in
|
||||||
environment = {
|
environment = {
|
||||||
SERVER_URL = cfg.serverUrl;
|
SERVER_URL = cfg.serverUrl;
|
||||||
COUCHDB_DATABASE = "obsidian_sync";
|
COUCHDB_DATABASE = "obsidian_sync";
|
||||||
COUCHDB_USER = if cfg.dockerEnvFiles == [] then "adminu" else null;
|
COUCHDB_USER = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "adminu";
|
||||||
COUCHDB_PASSWORD = if cfg.dockerEnvFiles == [] then "Password123" else null;
|
COUCHDB_PASSWORD = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "Password123";
|
||||||
};
|
};
|
||||||
environmentFiles = cfg.dockerEnvFiles;
|
environmentFiles = cfg.dockerEnvFiles;
|
||||||
volumes = [
|
volumes = [
|
||||||
|
|
|
@ -1,40 +1,38 @@
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA3VHM4
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBrcmlF
|
||||||
ekJTSmJvT2lTTHRBMzFXdFFHaytJK1lHemVmNnRnSURVbjVVK2lFCkxZNFZLUW1R
|
OFVrOTNvTHJ6d1ZqNDVIb3pNSUMyMzNsU241MXVKM3hxNHp6ZTIwCmtVcWVxbVIv
|
||||||
R055ZGNLNTZLcDg3Y0wzbUdRWVFFd1pjVlpVdVJVOVdBd0EKLT4gc3NoLWVkMjU1
|
UXRLdFkyOWU5Ty8wZ2djRnBKRWFYMlliTXF5eUozc25NL1UKLT4gc3NoLWVkMjU1
|
||||||
MTkgSmh2TCtRIHFwVE1aKytFYndQdHN4U0lDVjlIR3Q0STNrN3RkcTBLbVRxczM4
|
MTkgSmh2TCtRIHJXTzFaU2tERGxuak5Kc0NjbXZWbENJRG51YTFLMitldjJwa1Vk
|
||||||
dDBUV2cKcUd0cldLQTJ5Ti9uQjJFdC9YeDFmSUM2cTB3eWFwSXhqY0JQR0hOOTJi
|
ZUlRbUkKNGgxbFQ1bTVUMFJIck42eHUvYmcrREJzMDlvTVAwdFVhU1pTZEZTQXNE
|
||||||
awotPiBzc2gtZWQyNTUxOSBTcENqQlEgSkZuVVh6VlRORXZCR01LSU1uN3ViU0ln
|
ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgQ1BrZ2hoZEJadW1YdGNRZUxGZVI4VEJG
|
||||||
Vko2a09kaWhHNEREMkIyQjd6awpCd3liSkN6cERtbERnTENTQm5Lcm1XcGl2QVJw
|
c0taTkM2Qmg1YXFWTG1idjJEYwpoRTlMcWNTMmU3M0JCU01PbEJ5aUxhOVZFUXJi
|
||||||
MHR6VWZQUjZJd2Zud2UwCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBkOTYvVkN6Q2ht
|
YkRqUHdnS1QzWTFsUHRvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBPN3RKdW1Ib2Qx
|
||||||
ZGNlVWJpdGs3Q1pFT2ZmV25mYzE0cFB3Nzd6Tk11emxvCjRIVEJvdXU1dXNxSXhM
|
bXVzMzlBOXlUMXFCU24yVmoycUlWcU82UUx6eFEvYkNRCk1WWUswM0xlUWkzeUpt
|
||||||
a0JJanRtMUVjT3d3VTEyTHJRN3laVXdtVWZjdkUKLT4gc3NoLWVkMjU1MTkgWHpm
|
VnQxR21OU1pGSTByLzRZNlBsL25iQkR2c3VQcGcKLT4gc3NoLWVkMjU1MTkgWHpm
|
||||||
bWFRIGdrRTJJNFRud2JCcnZNWW9sanlaRTNxWmgxV0ErVVdDQXNTQU5IeFl2SE0K
|
bWFRIEM1UGIzZDExOWllOStvWmxUcXZGYTN1SEM3TDUyNWF1R2JEcm9CREZaMUEK
|
||||||
QUUxQ2NrWjJ4MUpobzBQRStVRGtZY1Q4QTdteWsrL3UwVm1EQVlnbTN0SQotPiBz
|
aE5iSG5zQ2JKanJGMlNiRnNZUVQ5TVNObFo5SWM5OThERS9Ga0ZnYU9SdwotPiBz
|
||||||
c2gtZWQyNTUxOSBSNSt4ZncgMDNBTW1UNUx3OWxmU2ZGdUtoWmc5ak0vWjV0RmFB
|
c2gtZWQyNTUxOSBSNSt4ZncgYi80anJ0WDNRTnhTeGw4ZGhiMzZHUHB5UkdicWp0
|
||||||
MWgxcVB3bC9QdlVRcwpyeWVSTkN3aHRBUkRybzF0S2MxcCtWRTBZVWsra1MvWVBX
|
aDJQQ0pIZXNwZ3hEYwpldkE5WmRQenV3TzdXSzZaT2xkK2hIMUpjNzFaam84dStu
|
||||||
cVVvampybkdVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBnSHhUTlpscUNLSjJYSTNu
|
ZzFCeTBxTHE4Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSAxdmowRWJyZytwUkJqRkJm
|
||||||
KzF2TzZ3V3IwZDBnRloySXVaMzJ5b3JlYUdJCjg2bVZDREpVcTY1TE8xR2h4OXlz
|
RWNRUUxsdXhXcDdVTTZkM1k0M1VPZkFteDBZCmp0WmZpK25Vc0t4NzVrQVZEZks1
|
||||||
QWtrRXZzS01XT01JSlJQZnU3Tm93bDQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFYx
|
cXVnQzA0cWliS0hSSWRXblQzRjU5Z2cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFB0
|
||||||
YW9iUWJNRGY5dFdkY2pCMm5sdTl4dHBIZXpqL0ZhWTA1V2FSZHoyd2MKWm0xdmFp
|
Y1dwT2RzYkVsSE5FSHRYbEYwNThvK2NUcWd6WGJzdEZiaGJBNG00bGcKQXphcy90
|
||||||
aGJWZDBLRURDZ21vT0F5NGlaVGw0Tml3dml0S3FpUkRiZGNGQQotPiBzc2gtZWQy
|
TElUN1g4RXVGa1NOSXhjREM5eE9mOHJHOGU5K2x1djlvUnJWawotPiBzc2gtZWQy
|
||||||
NTUxOSB3ZHJaSkEgcWhhT2sxQVJpMklMbmhpaHFVZU1BYi94aEhyVkVlN2Y2dHAr
|
NTUxOSB3ZHJaSkEgRWhmNUZxN0NxcllHT3V6TFVLbkhkVVFiUHorREFuZHkvYkFK
|
||||||
Vmtmak9pbwpMUk0xNHpCWHJFVTJSSkdzTTVwalFSQThjWmM2T1FWTEtzclIvMGMy
|
czViMTJTSQo5YzR1d3FRVFBIWDgzdXZOVGJVSGd0Rk5sZGtESUZ5LzVWdVhUMnJl
|
||||||
V3J3Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyA1d0tZUzJIcTNMY0ViaDdrcmJzRHZh
|
MUpzCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAxbi9WWnc3ZVhMa2kyQ1JXU1FTUDF5
|
||||||
ZThlK2E1Y091U1V2WXVDYTZvOXlrCmdlTGlMUG9FekExSHlkTFhUR2d5KzZDcnd1
|
N1pJOXhVQXBPc3E3cmtaZVcvOFVNClkyQ3UvcGNQTm1OZTJSZ0JNZXVzRWNUUU9Y
|
||||||
TFEzUUJlcGtaVzhJUkhrSmMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHVHc1dYZjJC
|
ZnJsMm9iaDRIN1V6bUhTSDgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFJpT2lSMUdI
|
||||||
dnRac2tBc2lqZmNaZ0NFYnozWm94VktEcEU0UGdiOFBsemMKU0hGQXZGTU9oNyt2
|
Z25NdnRaVHJwWW9uQ25WcWVoVnN1bW9DVUxra0Z2RlRQeWsKWUdNbEp3dDJTcHBp
|
||||||
SGZwTWViUVo5NCtWcGVNdHNnUGhFeGZhY044aTJSVQotPiBzc2gtZWQyNTUxOSBw
|
TUlzUE5mTVkwREE2b2NlMTdHVUFSMmpkRkFwcDJ5QQotPiBzc2gtZWQyNTUxOSBw
|
||||||
ZUZCUWcgUitGb1pRNEh5eTdldU5OaDNwYzFxRm1sZzRYVk8vT1crdTRjSVlDSUFU
|
ZUZCUWcgN0N2ZDJuSFRRSk4zZGVaSTJ1aGd4blVJVm9oY0s2ZHpVNXhWRXdCMFkw
|
||||||
SQo5MnhVZjMzMHlDZ3R3QnhXL2VsQmU4WHhlT1A0QmV4blFld3ozbDZLUVJzCi0+
|
dwpBYU85cnV0bkE1NjhUWVBzeGI1MFRtcG5uVlp6aTIyNFYzTmxqOEE0OWdrCi0+
|
||||||
IHNzaC1lZDI1NTE5IDl2LzJIQSBKTjBaTWtTb2JHbXFqTGMxamx2WkkxY0VPQ3Jz
|
IHNzaC1lZDI1NTE5IDl2LzJIQSAxS3VZUkxPZHNtYlJ4TGYrQ0pIOHBSZWMwOXlN
|
||||||
cVIvdnBnMXFSK0FnVlR3CjF6c2llYkZDTk9yY1E3Vjk2K2ZpbVFQVmJEMlV3cXNw
|
VnNyTmNQcjRCS3FObDNvCngrQ0ZTQ21XUkdKZURDaWJ1elNRc2VEYjNicXQxajFk
|
||||||
dkM0Sm81am1nMUkKLT4gTj5sLWdyZWFzZSBbQSwxRGc4CldWVUNsT1lITkFqOUpG
|
WFh2c010Z3NOUU0KLT4gc2w1N1FpLWdyZWFzZQpkZjA2bUlqNFh5eDNLZDIvT3VM
|
||||||
TEFUTHB3TkZJU2hQUGtuZ0ZNOFNEd0poQ1VGOXZyTnh5RTA0SGI2M0dpOHpBYzkz
|
YnJVKzI3OEcyU3ZwaHBEWQotLS0gbC9sUHZDeFVNV0pXQkR6SnBCYjFYZnUzQkN3
|
||||||
eUYKS1Rjb1lsaE13WTByUFRSbGN5aFQwcVdsVy8xcVY3aUo4Q2kxbk1iMTFLOUx6
|
eVhFVTVQd0cxOGF2K1BKVQoklAHBGEN9x6Tefj2B8he2iEFKipCl+nkkizdrMWTw
|
||||||
TGllbkR6QwotLS0gbncyWWhJdDN1QnlSR09WbnBSbUg5YVd3Y2swSVd6eW9OU3Js
|
j9ugsysqFomNM1CLn2LgRTzi75MK6rAZsFFX6K02SxISRU6XotyLXvJM+w/nh0Ev
|
||||||
Q1RObmR1dwqLMWIo7EfqRCDm9i7SEQEumyTsTrO85HdRhcn7MmM50cMJVhA0Evsp
|
knPLAxAPmgC+ES0tIVuTpUDG0sM9+iwGrEQ4w72pULmW0JjjskmM/xFPiI4fTlTY
|
||||||
tYUVfj1UWvL9w7r3AVzHr4Kcgz5dlVpgXQ/K3QL5Bxzx87KXdafJWkxzMMDE1dDM
|
tAsRaOui0Qgxg3Du34d44U16ThEq3yLItEITRl6dJJv1
|
||||||
94mu+/CErH7oFTE0LNEDDvhSZfNPC6+SvMuffAwUoEXExec8plSDBoCYIz0qz3Ci
|
|
||||||
95WU/HTXQ2om3FiCDxJJO+Tg4FjJDgxHwQ3Ldg==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ common }:
|
{ common }:
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
@ -17,6 +18,7 @@
|
||||||
# Obsidian Sync settings
|
# Obsidian Sync settings
|
||||||
services.obsidian_sync = {
|
services.obsidian_sync = {
|
||||||
serverUrl = "https://obsidiansync.joshuabell.xyz";
|
serverUrl = "https://obsidiansync.joshuabell.xyz";
|
||||||
|
dockerEnvFiles = [ config.age.secrets.obsidian_sync_env.path ];
|
||||||
};
|
};
|
||||||
|
|
||||||
## Give internet access
|
## Give internet access
|
||||||
|
|
|
@ -134,6 +134,13 @@
|
||||||
proxyPass = "http://100.64.0.13";
|
proxyPass = "http://100.64.0.13";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"obsidiansync.joshuabell.xyz" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://100.64.0.1:5984";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
"_" = {
|
"_" = {
|
||||||
default = true;
|
default = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue