slapos:6254e6827a7ae5e2ae35559c6d15fbd729fbf72e commitshttps://lab.nexedi.com/nexedi/slapos/-/commits/6254e6827a7ae5e2ae35559c6d15fbd729fbf72e2017-01-17T07:31:50+01:00https://lab.nexedi.com/nexedi/slapos/-/commit/6254e6827a7ae5e2ae35559c6d15fbd729fbf72ecloudooo-repository: use the stable branch in ERP5 SR.2017-01-17T07:31:50+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/08e77637030720c27e9f0c3a402b00c5fc7ad00dNEO: add a SR to set up a test suite with latest transaction/ZODB2017-01-16T21:19:23+01:00Julien Muchembledjm@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/38381007d87dd365151e53a9f70b141a49703c43version up: LibreOffice 5.2.4.2.2017-01-13T16:31:23+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/d14dc814eb5ff567cd9e04fd1be12ab2b553ebdcgitlab: watcher should take care of sidekiq killed by SIGTERM2017-01-12T13:35:28+03:00Kirill Smelkovkirr@nexedi.com
The watcher should also watch for signals like SIGTERM killing sidekiq, which
are trapped by sidekiq, with sidekiq exiting successfully (with exit code 0).
To achieve this we rework our watcher-sigkill to be a generic watcher -
that can be given a set of restart exit codes including signal names and
monitors whether child process terminated with matching for restart exit
code.
Example usage:
watcher 0,SIGKILL prog ...
Based on patch by <a href="/iv" data-user="36" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="iv">@iv</a>.
Discussion: <a href="https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/25#note_22085">https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/25#note_22085</a>https://lab.nexedi.com/nexedi/slapos/-/commit/e7e37398a9cad80cabdfa50aa7f46be06d18629bversion up: libgpg-error-1.26, libgcrypt-1.6.6 and gnutls-3.3.26.2017-01-11T10:46:28+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/90f45a53a7df70d9f7dd1597674cd660ae9a3dfaversion up eggs.2017-01-11T10:34:47+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/b59588286cbbf0d0727a4629cafa75ca7e733a48version up: curl 7.52.1, including security fixes.2017-01-11T10:34:44+01:00Kazuhiko Shiozakikazuhiko@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/1a826b9b6e99b45c5ed5e09941e8579f49ede0e9new slapos.cookbook development version2017-01-09T17:30:50+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/8bc27e6856dfe935fbb5c2b6a14ecf7a5b793bf6use slapos.cookbook 1.0.452017-01-09T17:14:12+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/ba95ca45b3350ce772e0c82ddaf8bbd263b36cc0Release slapos.cookbook 1.0.452017-01-09T17:08:15+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/48dc7fd831b6b460c10f01a7bc02d7f2b28b8f0ause slapos.toolbox 0.632017-01-09T15:59:37+00:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/6973ffd987c066a136bb2e50935a858a5eee6dfcmonitor: allow to set timeout value for all promises2017-01-09T15:00:02+00:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://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="/iv/slapos/-/commit/571d6514f7290e8faa9439c4b86aa2f6c87df261" data-original="571d6514" data-link="false" data-link-reference="false" data-project="220" 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">!122</a>