jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
18,518 Commits 33 Branches 583 Tags
ab0f8fc08163b6e00a4e6f414003d2d1a20d8c7d
Commit Graph

731 Commits

Author SHA1 Message Date
Girish Ramakrishnan
ccb340cf80 Use systemd drop in to configure docker 
The built-in service files get overwritten by updates

Fixes #203
 2017-01-30 12:41:07 -08:00
Girish Ramakrishnan
56b0f57e11 Move unbound systemd config to separate file 2017-01-30 12:39:19 -08:00
Girish Ramakrishnan
08ffa99c78 Use %s instead of %d 
awk's %d behaves differently with mawk (scaleway) and gawk (do)

Fixes #200
 2017-01-30 10:24:26 -08:00
Girish Ramakrishnan
ddf5c51737 Make it 90 instead 2017-01-26 15:45:07 -08:00
Girish Ramakrishnan
88fc7ca915 move the files and not the directory 
... because box is a btrfs subvolume
 2017-01-26 14:16:27 -08:00
Girish Ramakrishnan
ebd3a15140 always restart nginx 2017-01-25 12:04:52 -08:00
Girish Ramakrishnan
d93edc6375 box.service: start after nginx 2017-01-25 11:28:31 -08:00
Girish Ramakrishnan
f142d34f83 Move box data out of appdata volume 
This lets us restore the box if the app volume becomes full

Fixes #186
 2017-01-24 13:48:09 -08:00
Girish Ramakrishnan
357ca55dec remove unused var 2017-01-24 10:41:58 -08:00
Girish Ramakrishnan
d7a8731027 remove unused var 2017-01-24 10:41:38 -08:00
Girish Ramakrishnan
9117c7d141 Use $USER 2017-01-24 10:32:32 -08:00
Johannes Zellner
db8db430b9 Avoid warning from systemd by reloading the daemon after chaning journald config 2017-01-23 11:01:02 +01:00
Johannes Zellner
c0b2b1c26d Escape shell vars in the unbound unit file 2017-01-23 10:27:23 +01:00
Johannes Zellner
7da20e95e3 Use a proper systemd unit file for unbound 
Part of #191
 2017-01-23 10:14:20 +01:00
Girish Ramakrishnan
f30f90e6be Stop mail container before moving the dirs 2017-01-22 21:57:34 -08:00
Girish Ramakrishnan
7f05b48bd7 Revert "Migrate mail data after downloading restore data" 
This reverts commit e7c399c36a.
 2017-01-22 02:42:14 -08:00
Girish Ramakrishnan
e7c399c36a Migrate mail data after downloading restore data 
This allows us to be backward compatible
 2017-01-21 23:33:57 -08:00
Girish Ramakrishnan
d84666fb43 Move mail data out of box 
This will help us with putting a size on box data

Mail container version is bumped because we want to recreate it

Part of #186
 2017-01-20 20:22:08 -08:00
Girish Ramakrishnan
1eb33099af dkim directory is now automatically created in cloudron.js 2017-01-20 15:18:03 -08:00
Johannes Zellner
6eafac2cad Do not rely on fdisk's human readable unit output 
Using the bytes output will fix an issue where the disk size is reported
either as terrabyte or also megabyte.
So far we disallowed 1TB disks but allowed 20MB disks.
 2017-01-19 13:53:50 +01:00
Girish Ramakrishnan
804947f039 use dir mount instead of file mount 
file mounting is fraught with problems wrt change notifications.

first, we must be carefule that the inode does not change.

second, changes outside container do not result in fs events inside the container.
haraka cache settings files and relies on fs events. So, even
though the file gets updated inside the container, haraka doesn't
see it.

https://github.com/docker/docker/issues/15793
 2017-01-17 23:59:23 -08:00
Girish Ramakrishnan
d45927cdf4 unbound: listen on 0.0.0.0 2017-01-13 15:22:54 -08:00
Girish Ramakrishnan
055e41ac90 Make unbound reply on cloudron network 
Because of the docker upgrade, dnsbl queries are failing again
since we are not using the unbound server from the containers.

For some reason, docker cannot query 127.0.0.1 (https://github.com/docker/docker/issues/14627).

Make unbound listed on the cloudron network and let docker proxy
DNS calls to unbound (docker always use the embedded DNS server
when using UDN).

See also #130
 2017-01-12 19:28:23 -08:00
Johannes Zellner
1c9f2495e3 Show the detailed backup progress during update 
Fixes #157
 2017-01-12 16:00:34 +01:00
Girish Ramakrishnan
b4477d26b7 Reload the docker service file 2017-01-11 15:40:16 -08:00
Girish Ramakrishnan
ce0afb3d80 Explicitly specify the storage driver as devicemapper 
For reasons unknown, the images build by the buildbot (which currently
uses btrfs), does not work with devicemapper.

Existing cloudrons with aufs will not be affected because docker will
just ignore it.

devmapper: Base device already exists and has filesystem xfs on it. User specified filesystem will be ignored.

Existing AUFS users can move to devicemapper either by restoring to
a new cloudron (recommended) OR
* systemctl stop box
* systemctl stop docker
* rm -rf /var/lib/docker
* Edit /home/yellowtent/data/INFRA_VERSION. Change the "version" field to "1"
* systemctl start docker
* systemctl start box # this will download images all over

Fixes #182
 2017-01-11 14:53:11 -08:00
Girish Ramakrishnan
4c719de86c restart docker only if config changed 2017-01-10 18:50:21 -08:00
Girish Ramakrishnan
6f2b2adca9 Enable apparmor explicitly 2017-01-10 18:15:10 -08:00
Johannes Zellner
9b9d30c092 Remove commented out section of the nginx.conf 2017-01-11 00:09:51 +01:00
Girish Ramakrishnan
26ed331f8e Add default clients in clients.js 2017-01-09 15:41:29 -08:00
Johannes Zellner
fd479d04a0 Fix nginx config to make non vhost configs default_server 
Nginx does not match on the ip as a vhost. This no basically replaces
the commented out section in the nginx.conf
 2017-01-06 22:09:10 +01:00
Girish Ramakrishnan
cc9904c8c7 Move nginx config and cert generation to box code 2017-01-06 10:23:10 +01:00
Johannes Zellner
2d6d8a7ea8 Create fallback certs only if fqdn is already set 2017-01-05 16:29:10 +01:00
Johannes Zellner
5b5ed9e043 Always create box/mail/dkim folder 2017-01-05 16:15:00 +01:00
Johannes Zellner
801c40420c Create setup nginx config and cert for ip setup 2017-01-05 16:02:03 +01:00
Johannes Zellner
d9865f9b0f Allow box to startup without fqdn 2017-01-05 14:02:04 +01:00
Girish Ramakrishnan
c8a9412995 suppress error message 2016-12-30 14:23:16 -08:00
Girish Ramakrishnan
90c1fd4c31 rename the service to cloudron-resize-fs 2016-12-30 11:27:00 -08:00
Girish Ramakrishnan
fad6221750 Run cloudron-system-setup before box 2016-12-30 11:23:53 -08:00
Johannes Zellner
7d06f9e1e3 Add comment why the script might fail on unsupported small disks 2016-12-30 11:53:35 +01:00
Johannes Zellner
1e4e76b0dd give disk size a unit in cloudron-system-setup.sh 2016-12-30 11:49:57 +01:00
Girish Ramakrishnan
7eaa3ef52e Use the ejs-cli of the new box code 2016-12-29 19:17:31 -08:00
Girish Ramakrishnan
81a60b029d bash is dangerous (script_dir was marked readonly in parent script!) 2016-12-29 15:34:30 -08:00
Girish Ramakrishnan
decbfe0505 More start.sh cleanup 2016-12-29 14:35:48 -08:00
Girish Ramakrishnan
379042616f Ensure box.service starts after mysql.service 2016-12-29 14:24:29 -08:00
Girish Ramakrishnan
df2878bc2e Prettify start.sh 2016-12-29 14:22:42 -08:00
Girish Ramakrishnan
1ff35461a2 Remove obsolete design doc 2016-12-29 13:21:09 -08:00
Girish Ramakrishnan
7de94fff1b Merge container logic into start.sh 
This whole container thinking is over-engineered and we will get to
it if and when we need to.
 2016-12-29 12:01:59 -08:00
Girish Ramakrishnan
bbd63b2c57 Prettify container.sh 2016-12-28 08:59:26 -08:00
Girish Ramakrishnan
b1854f82f2 prettify init base image script 2016-12-28 08:59:25 -08:00