slapos:a30c52be1a51a7aa26e40088b6e12a4d8595b69d commitshttps://lab.nexedi.com/nexedi/slapos/-/commits/a30c52be1a51a7aa26e40088b6e12a4d8595b69d2017-01-06T16:43:16+01:00https://lab.nexedi.com/nexedi/slapos/-/commit/a30c52be1a51a7aa26e40088b6e12a4d8595b69dbetter check if timeout parameter is an integer2017-01-06T16:43:16+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/afa131fe84905a3e26a37e5c06f07bca7c32b8f9monitor can set timeout value for check_url promise2017-01-06T16:43:16+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/61670ea25a488aebc24a6e99bec88e207f23ea9fset default timeout of check url promise to 20 seconds2017-01-06T16:43:16+01:00Alain Takoudjoualain.takoudjou@nexedi.comAlso allow to change promise timeout by editing check_url_PROMISE_TIMEOUT filehttps://lab.nexedi.com/nexedi/slapos/-/commit/e82d69be7c69e543f5828ca9d5bdff794b04de44monitor: move promise to check if slapgrid succeed to monitor stack2017-01-06T16:43:16+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/e3539b57338919073ebb5a235049bc82f2bd7ea3gitlab: use git version 2.10.2 for now2017-01-05T12:42:50+03:00ivisabelle.vallet@nexedi.com
An issue on Gitlab SR when pushing on protected branches occurs with git 2.11.
Gitlab issue: <a href="https://gitlab.com/gitlab-org/gitlab-ce/issues/25601" rel="nofollow noreferrer noopener" target="_blank">https://gitlab.com/gitlab-org/gitlab-ce/issues/25601</a>
Fixes: <a href="https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/37">https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/37</a>https://lab.nexedi.com/nexedi/slapos/-/commit/ca11274a60612ea979870a3156a366f99f8c9bd0slaprunner: better way to list instance's backup files in export script2017-01-04T11:21:51+01:00Nicolas Wavrantnicolas.wavrant@nexedi.com
Getting them from the runner backup avoids to get false positive if some
of the instance's backup files were excluded using an exporter.exclude filehttps://lab.nexedi.com/nexedi/slapos/-/commit/05311d310b78b132e3c2b27749873c874a2b3adfnew slapos.cookbook development version2016-12-30T15:56:04+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/5bfeda846a91381300bb230b09e8357948fb0b86slapos.cookbook version up 1.0.442016-12-30T15:53:59+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/e1a9a751c0310eb8bfc3480c44619a44d1ee8abdRelease slapos.cookbook 1.0.442016-12-30T15:26:54+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/0523c6cf3b056a92d132b46405924dc71d896583remove dropbear keysplit test, as keysplit method doesn't exists anymore2016-12-30T15:06:20+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/852cb44bdae7fbaacbbd0f908c4a9f9fe5bf5493use slapos.toolbox 0.622016-12-30T13:54:20+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/dcfe9c5f2474f70ad35ecae5945a1fa2f1e0533cgitlab: fix PATH for gitlab-exporter script2016-12-30T12:36:36+03:00ivisabelle.vallet@nexedi.com
In prevision for gitlab-backup restore to be done in a script. In fact, it requires `sed` command to be available.
We have to add /bin to the PATH as `which sed` returns `/bin/sed`.https://lab.nexedi.com/nexedi/slapos/-/commit/9e01d769ea571d95fef524904275a3b6e8b65d1cgitlab: Upgrade to 8.8.9 + start automation of gitlab-backup2016-12-29T17:58:56+03:00ivisabelle.vallet@nexedi.com
# Upgrade
* GitLab Software + patches ported to GitLab 8.8.9;
* Configs synced with upstream and SlapOS-ified;
* Fix promises due to curl upgrade
<a href="/jerome" data-user="9" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Jérome Perrin">@jerome</a> <a href="/kazuhiko" data-user="5" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Kazuhiko Shiozaki">@kazuhiko</a> <a href="/kirr" data-user="14" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Kirill Smelkov">@kirr</a>: if you have any comments, I would be glad to read them. There is a [demo instance](<a href="https://softinst69126.host.vifib.net" rel="nofollow noreferrer noopener" target="_blank">https://softinst69126.host.vifib.net</a>) you can try.
Check on the demo instance for the Gitlab configuration:
- [x] migrations are all `up`, when running: `gitlab-rake db:migrate:status`
- [x] promises don't fail (including slow ones)
- [x] web UI seems fine
- [x] git clone/fetch/push works well
- [x] email notifications are sent
and Nexedi edition patches:
- [x] raw blobs download
- [x] private ones with gitlab-ci token `curl -v <a href="https://user:token@testinstance/kirr/test/raw/master/hello.txt%60" rel="nofollow noreferrer noopener" target="_blank">https://user:token@testinstance/kirr/test/raw/master/hello.txt`</a>
- [x] applying patches in merge-request
- [x] merge as topic in merge-request
- [x] "Nexedi edition" being present on front page and on page footers with ICP
- [x] clone protocol is only HTTPS (not SSH)
No changes are made in gitlab-workhorse and gitlab-shell upstream this time, but Nexedi patches and a cherry-picked commit are applied in a merge request on gitlab-ce.
Note: in order to build the gitlab SR, you need to change gitlab-ce repository to my own, as it is not merged yet:
```
--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -115,7 +115,7 @@ git-executable = ${git:location}/bin/git
[gitlab-repository]
<= git-repository
#repository = <a href="https://gitlab.com/gitlab-org/gitlab-ce.git" rel="nofollow noreferrer noopener" target="_blank">https://gitlab.com/gitlab-org/gitlab-ce.git</a>
-repository = <a href="https://lab.nexedi.com/nexedi/gitlab-ce.git">https://lab.nexedi.com/nexedi/gitlab-ce.git</a>
+repository = <a href="https://lab.nexedi.com/iv/gitlab-ce.git">https://lab.nexedi.com/iv/gitlab-ce.git</a>
```
# Gitlab backup (pull automation)
The idea is to regularly do a gitlab-backup pull for now, so that later, we can add some code to configure the other gitlab instance (not in production) to pull the created backup repo.
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/124" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/124" data-link="false" data-link-reference="true" data-project="15" data-merge-request="824" data-project-path="nexedi/slapos" data-iid="124" data-mr-title="WIP: gitlab: Upgrade to 8.8.9 + start automation of gitlab-backup" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!124</a>https://lab.nexedi.com/nexedi/slapos/-/commit/ae7b4120364cc9a0f05a1e51b98962a20fb53560gitlab: start automation of gitlab-backup2016-12-29T17:52:19+03:00ivisabelle.vallet@nexedi.com
- git-clone and build git-backup sources
- add a cron job doing `gitlab-backup-pull` every 4 hours by default
- add instance parameter to change backup frequency
- add xnice for using less resources while backuping
- add lock to avoid concurrent calls of backup script
- add a specific software type `gitlab-export` doing all this instead of in
`default`; this can be changed in Services > parameters (kirr's changes)
`coreutils`, `grep` and `tar` components are used by `gitlab-backup-pull`
script, as it is called from a cron and the PATH has to include these
binaries pathshttps://lab.nexedi.com/nexedi/slapos/-/commit/25acc4737b7b1e0be3cafa664c2450a73bb19fb3gitlab: use slapos-cookbook-develop + pin slapos cookbook version2016-12-29T17:51:45+03:00ivisabelle.vallet@nexedi.com
This is needed until the patch regarding `pidfile` in wrapper.py
(<a href="/nexedi/slapos/-/commit/571d6514f7290e8faa9439c4b86aa2f6c87df261" data-original="571d6514" data-link="false" data-link-reference="false" data-project="15" data-commit="571d6514f7290e8faa9439c4b86aa2f6c87df261" data-reference-type="commit" data-container="body" data-placement="top" data-html="true" title="slapos: allow usage of pidfile in wrapper recipe" class="gfm gfm-commit has-tooltip">571d6514</a>) is added to released SlapOS cookbook egg.https://lab.nexedi.com/nexedi/slapos/-/commit/ee91827bdfe0b0ea6a4d52110161134645adc4f6qemu: version up, 2.8.02016-12-28T15:45:22+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/66d2aad54047c16218ab328d19d75db379f5d3d9sshd: fix generation of authorized_keys2016-12-21T15:41:07+01:00Julien Muchembledjm@nexedi.com
No need to parse. This fixes several issues:
- key comments were messing up everything
- sometimes keys were repeated
- no way to remove keyhttps://lab.nexedi.com/nexedi/slapos/-/commit/e4546cf5f3c527d9127d35aae5d3c55fdd07141fversion up: OpenSSH 7.4p1 including security fixes.2016-12-20T13:46:48+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/3bdc7451463627e9fc1c5cb7139477461a4ba706NEO: use simpler wrappers for services2016-12-19T12:11:52+01:00Julien Muchembledjm@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/4a3b175245a59ab8fdd61252da3052f0a62460dcversion up: ca-certificates 201611302016-12-19T11:06:57+01:00Julien Muchembledjm@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/f7dd85f1058f883ecbec2976418107a4bf1a4dc4version up: Python 2.7.13.2016-12-19T10:12:45+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/f04077b5675fd8c6521e881049033b2ca4ddb227version up: MariaDB 10.1.20, groonga 6.1.1 and mroogna 6.11.2016-12-19T10:12:45+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/76cfa45dd9c7c66b32ec9289237d332591fa2500NEO: add a neoctl wrapper in every partition with an admin node2016-12-16T20:47:17+01:00Iliya Manolovilmanfordinner@gmail.com
The purpose of the added script is to shorten calling neoctl by removing the
need to constantly supply things SlapOS can provide on its own like
certificates and admin address. A sample command is now as simple as:
~/srv/runner/instance/slappartX/bin/neoctl set cluster STARTING_BACKUP
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/120" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/120" data-link="false" data-link-reference="true" data-project="15" data-merge-request="808" data-project-path="nexedi/slapos" data-iid="120" data-mr-title="NEO: add a neoctl wrapper in every partition with an admin node" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!120</a>https://lab.nexedi.com/nexedi/slapos/-/commit/923a6e86c4a047102c4e37237ad97cee28bf3967wkhtmltopdf: version up to 0.12.42016-12-16T17:22:29+01:00Tristan Caveliertristan.cavelier@nexedi.com
As `setuptools.archive_util.unpack_archive` (or self.extract
from slapos.recipe.build) is not able to handle .tar.xz archives,
tar component is added to wkhtmltopdf build dependencies.https://lab.nexedi.com/nexedi/slapos/-/commit/2e5484400a00b4e2f0273c26709b65e3ff8492c8wkhtmltopdf: fix argument propagation to wkhtmltopdf binary2016-12-16T17:22:29+01:00Tristan Caveliertristan.cavelier@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/3cab4d57bb49b6df892b9329d612c4efdc7cf52dwkhtmltopdf: fix current working directory issue2016-12-16T17:22:29+01:00Tristan Caveliertristan.cavelier@nexedi.com
As wkhtmltopdf sometimes needs to get files in
current working directory ONLY, this has to be
set correctly.
E.g. `wkhtmltopdf toc --xsl-style-sheet no_absolute_path.xsl input.html output.pdf`https://lab.nexedi.com/nexedi/slapos/-/commit/884dcfaf0549aeba3eb3b534300566df56f3e454openvpn: fix segfaults since we upgraded to 2.3.11+2016-12-16T14:48:16+01:00Julien Muchembledjm@nexedi.com
After some upstream refactoring, a #include is missing (at least up to 2.3.14),
but still pulled implicitely when openssl is built with engines. This commit
fixes the configure step, so that HAVE_OPENSSL_ENGINE is true as expected.
More on <a href="https://community.openvpn.net/openvpn/ticket/792" rel="nofollow noreferrer noopener" target="_blank">https://community.openvpn.net/openvpn/ticket/792</a>https://lab.nexedi.com/nexedi/slapos/-/commit/77bfb0b014f1c41e8bf249b7115afcf968184c57Use most recent version.2016-12-16T09:01:41+01:00Ivan Tyagovivan@nexedi.com
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/122" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/122" data-link="false" data-link-reference="true" data-project="15" data-merge-request="818" data-project-path="nexedi/slapos" data-iid="122" data-mr-title="Use most recent version." data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!122</a>https://lab.nexedi.com/nexedi/slapos/-/commit/5c6cb6d68baaff0d8596a6a3a5406e5510e75defslaprunner: webrunner's webdav explicetly tells to user to not cache on diffe...2016-12-15T16:31:31+01:00Nicolas Wavrantnicolas.wavrant@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/571d6514f7290e8faa9439c4b86aa2f6c87df261slapos: allow usage of pidfile in wrapper recipe2016-12-15T14:50:31+01:00ivisabelle.vallet@nexedi.com
The 'pidfile' parameter is passed to 'createWrapper' method in order to
avoid concurrent calls.https://lab.nexedi.com/nexedi/slapos/-/commit/0d90b242fbde20a821acab59278b1fcfea9fb6e3Revert "Revert "software/neoppod & stack/erp5: Hook in zodbutils""2016-12-13T15:49:57+01:00Kirill Smelkovkirr@nexedi.com
This reverts commit <a href="/jp/slapos/-/commit/7f6729de1dd5647163defad7f6f66e9c5d158d32" data-original="7f6729de1dd5647163defad7f6f66e9c5d158d32" data-link="false" data-link-reference="false" data-project="610" data-commit="7f6729de1dd5647163defad7f6f66e9c5d158d32" data-reference-type="commit" data-container="body" data-placement="top" data-html="true" title='Revert "software/neoppod & stack/erp5: Hook in zodbutils"' class="gfm gfm-commit has-tooltip">7f6729de</a>.
ZODB has been switched to ZODB4 in <a href="/jp/slapos/-/commit/447b27e634673ab95b95c02877ba03364c41d72c" data-original="447b27e6" data-link="false" data-link-reference="false" data-project="610" data-commit="447b27e634673ab95b95c02877ba03364c41d72c" data-reference-type="commit" data-container="body" data-placement="top" data-html="true" title="Switch from ZODB3 (3.10.7) to ZODB (4.4.4)" class="gfm gfm-commit has-tooltip">447b27e6</a> (Switch from ZODB3 (3.10.7)
to ZODB (4.4.4)) including raising transaction version requirement to
1.7.0 so we can try to introduce zodbtools one more time.
/proposed-for-review-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/121" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/121" data-link="false" data-link-reference="true" data-project="15" data-merge-request="810" data-project-path="nexedi/slapos" data-iid="121" data-mr-title='Revert "Revert "software/neoppod & stack/erp5: Hook in zodbutils""' data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!121</a>https://lab.nexedi.com/nexedi/slapos/-/commit/fd8673ba49272f007f5c4970bb2b500da7f70ef5version up: openvpn 2.3.142016-12-12T12:01:17+01:00Julien Muchembledjm@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/885cbd6d44659405a4b3a48c6c76ad3d06bc04a5fixup! NEO: enable innodb_file_per_table by default2016-12-08T21:31:36+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/ae1d440ff9edd87a801df16779a0605db1823152version up: gc 7.2g.2016-12-08T21:29:38+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/3b5f73e240d08f0bedcf343210075f07109ab8c1version up : libtiff 4.0.7 including security fixes.2016-12-08T21:29:38+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/0e4002d1d09c5ea0a01ed22e232d276aba6bb4aeNEO: enable innodb_file_per_table by default2016-12-08T20:11:31+01:00Julien Muchembledjm@nexedi.com
Without it, the interest of tweaking the partition table is limited, because:
- it is impossible to free space efficiently
- 'optimize table' is even slowerhttps://lab.nexedi.com/nexedi/slapos/-/commit/9854c583703e99630945bbec062aa6590087a1d3slaprunner: export script shouldn't succeed if the backup of the contained...2016-12-08T16:20:26+01:00Nicolas Wavrantnicolas.wavrant@nexedi.comslaprunner: export script shouldn't succeed if the backup of the contained instances are running at the same time
https://lab.nexedi.com/nexedi/slapos/-/commit/04ff7a7ce6aa3df957331ade729edacbf98685e3fix monitor boostratp status promise2016-12-08T12:23:05+00:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/c3efd062fa72809e161bcb7a7a57dc6090389064ERP5: fix generation of bin/runzeo after the switch to ZODB42016-12-08T10:46:19+01:00Julien Muchembledjm@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/350bb10fad6096ca34b64d2e72a2f58000f1cecdpbs: handles the fact that some parameters are not present when slaves are down2016-12-07T10:48:48+01:00Nicolas Wavrantnicolas.wavrant@nexedi.com