List of commits:
Subject Hash Author Date (UTC)
Forgot to remove a function after moving it b6fd0700cf5dde953acb0d4584a48cb404a69ab2 Catalin(ux) M. BOIE 2021-11-17 19:27:04
Prepare correctly for rgfs (missed some places) 38d255af17a72fd9f92a8c37d4fddc8f2caf023b Catalin(ux) M. BOIE 2021-11-17 18:05:01
TODO/cosmetic d4968bc1d9c8bbe3c4aba2479f3694a7a3863d0f Catalin(ux) M. BOIE 2021-11-17 18:04:36
More debug help 74f45188bffd7630d0c08648433749a3ef23c9af Catalin(ux) M. BOIE 2021-11-15 17:34:58
worker: Fixed a stupid bug leading to wrong distro upgrade command d9bc215557cd9a6f30dbc90434dc3aba46e39979 Catalin(ux) M. BOIE 2021-11-14 16:16:43
Silence an 'unpack' exception when we do not have enough bytes. add562b15d94501a0585001db526b241c251b6e6 Catalin(ux) M. BOIE 2021-11-14 11:25:01
Run struct and fixes under the same lock d046942317c73351473a18eb833318aec3f4d907 Catalin(ux) M. BOIE 2021-11-14 08:18:05
spec file small updates 7aef02df6ed5f6ce4d39cd2a926a79bcdc1a3c5a Catalin(ux) M. BOIE 2021-11-14 06:33:35
Typo b0087441b4d637c7bf6ed64b6c243ad2ec8f1493 Catalin(ux) M. BOIE 2021-11-14 06:15:00
spec: Added 'Replaces: rocketgit' to easy upgrade, fixed fixfiles c380f40fe86ddf70b99030a6f0be93d91137b909 Catalin(ux) M. BOIE 2021-11-14 06:14:25
Fixed non debug case of rg_debug_html 523f6784671e5f810b8435ad66ad21ea548219d8 Catalin(ux) M. BOIE 2021-11-14 05:58:37
Fix rate limit types 0de3ee35d0d0e46521d64a596232765fb5d618a3 Catalin(ux) M. BOIE 2021-11-14 05:58:03
commented request_slowlog_timeout 505877b567807e11f25695de58725f316f10043e Catalin(ux) M. BOIE 2021-11-13 17:32:46
systemctl git.socket rethinking 3c71e58760f6abc69db661098840c277d4fc13fb Catalin(ux) M. BOIE 2021-11-13 17:25:52
PHP FALSE verus NULL correction 42f8bc560a0ec2203f0974e203e6c33ec26aa983 Catalin(ux) M. BOIE 2021-11-13 16:31:33
.spec: some minor corrections 70c3a23f507d57c729e0d710ec99060e0e88c238 Catalin(ux) M. BOIE 2021-11-13 16:22:11
Rework locking for struct update da8c09e15e485563d9573de3aff2a7ad999d2527 Catalin(ux) M. BOIE 2021-11-13 16:15:45
gpg: specify rsa 4096 instead of default because it does not work on f34 eccdc02a82ce87f426eebc995988f907d914a3c7 Catalin(ux) M. BOIE 2021-11-13 16:15:15
Cosmetic 0b0a9f2d1922d4d28052c6b1fbe737cc4302ce73 Catalin(ux) M. BOIE 2021-11-13 16:14:37
PHP8 corrections 51f2cabc7298b5006bf8f0d215c1a338bee92cdb Catalin(ux) M. BOIE 2021-11-13 16:13:13
Commit b6fd0700cf5dde953acb0d4584a48cb404a69ab2 - Forgot to remove a function after moving it
Author: Catalin(ux) M. BOIE
Author date (UTC): 2021-11-17 19:27
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2021-11-17 19:27
Parent(s): 38d255af17a72fd9f92a8c37d4fddc8f2caf023b
Signing key:
Tree: 9a4268e189c7674cf1ecfefb03b2a2ae10d22e24
File Lines added Lines deleted
TODO 1 0
inc/user/packages.inc.php 0 17
inc/user/packages_core.inc.php 19 0
inc/user/packages_rpm.inc.php 1 0
rocketgit.spec 3 2
scripts/worker.php 5 5
File TODO changed (mode: 100644) (index 9acb01e..5fe4f3f)
60 60 Seems we are cloning the namespace, before knowing if the user can push! Seems we are cloning the namespace, before knowing if the user can push!
61 61
62 62 == FOR OTHER RELEASE == == FOR OTHER RELEASE ==
63 [ ] worker: allow any kind of package installation if the worker is of user type.
63 64 [ ] Seems we install dependencies from spec file twice! [ ] Seems we install dependencies from spec file twice!
64 65 [ ] worker: should I tunnel rgfs over the worker connection? [ ] worker: should I tunnel rgfs over the worker connection?
65 66 [ ] worker: stats - send also the number of bytes sent/received with builder [ ] worker: stats - send also the number of bytes sent/received with builder
File inc/user/packages.inc.php changed (mode: 100644) (index e77ac66..bc36eb0)
... ... function rg_packages_web($db, $rg, $paras, $pass)
611 611 rg_log_exit(); rg_log_exit();
612 612 } }
613 613
614 /*
615 * Prepare array with rgfs information
616 */
617 function rg_pkg_prepare_for_rgfs($db, &$a)
618 {
619 $list = array('rgfs_server', 'rgfs_port', 'rgfs_url');
620 foreach ($list as $k) {
621 $_r = rg_state_get($db, $k);
622 if ($_r !== FALSE) {
623 rg_log('DEBUG: a[' . $k . '] set to ' . $_r);
624 $a[$k] = $_r;
625 } else {
626 rg_log($k . ' is not defined');
627 }
628 }
629 }
630
File inc/user/packages_core.inc.php added (mode: 100644) (index 0000000..e065ce6)
1 <?php
2
3 /*
4 * Prepare array with rgfs information
5 */
6 function rg_pkg_prepare_for_rgfs($db, &$a)
7 {
8 $list = array('rgfs_server', 'rgfs_port', 'rgfs_url');
9 foreach ($list as $k) {
10 $_r = rg_state_get($db, $k);
11 if ($_r !== FALSE) {
12 rg_log('DEBUG: a[' . $k . '] set to ' . $_r);
13 $a[$k] = $_r;
14 } else {
15 rg_log($k . ' is not defined');
16 }
17 }
18 }
19
File inc/user/packages_rpm.inc.php changed (mode: 100644) (index b10344c..803219f)
1 1 <?php <?php
2 2 require_once(__DIR__ . '/../events.inc.php'); require_once(__DIR__ . '/../events.inc.php');
3 3 require_once(__DIR__ . '/../mime.inc.php'); require_once(__DIR__ . '/../mime.inc.php');
4 require_once(__DIR__ . '/packages_core.inc.php');
4 5
5 6 /* /*
6 7 * Event functions * Event functions
File rocketgit.spec changed (mode: 100644) (index e9e0ac8..0497a4d)
... ... Provides: rocketgit
20 20 Conflicts: rocketgit Conflicts: rocketgit
21 21
22 22 # fuse is required for rgfs # fuse is required for rgfs
23 Requires: httpd-filesystem, nginx-filesystem, php-fpm, php-cli, php-pgsql, php-mbstring
24 Requires: git-core, cronie, php-json, php-ldap
23 Requires: httpd-filesystem, nginx-filesystem
24 Requires: php-pgsql, php-mbstring, php-json, php-ldap, php-fpm, php-cli
25 Requires: git-core, cronie
25 26 Requires: util-linux, qrencode, fuse, openssh-server, gpg Requires: util-linux, qrencode, fuse, openssh-server, gpg
26 27
27 28 # SELinux stuff # SELinux stuff
File scripts/worker.php changed (mode: 100644) (index 7489a0c..31a44da)
... ... function start_worker_build_tools($job, &$reason, &$reason2)
603 603 . ' spec_ver=`grep ^Version: "${spec_file}" | cut -d: -f2 | tr -d " \t\r\n"`' . "\n" . ' spec_ver=`grep ^Version: "${spec_file}" | cut -d: -f2 | tr -d " \t\r\n"`' . "\n"
604 604 . ' spec_rel=`grep ^Release: "${spec_file}" | cut -d: -f2 | tr -d " \t\r\n"`' . "\n" . ' spec_rel=`grep ^Release: "${spec_file}" | cut -d: -f2 | tr -d " \t\r\n"`' . "\n"
605 605 . ' spec_deps=`rpmspec --parse "${spec_file}" | grep ^BuildRequires | cut -d: -f2 | tr ",\t\r\n" " "`' . "\n" . ' spec_deps=`rpmspec --parse "${spec_file}" | grep ^BuildRequires | cut -d: -f2 | tr ",\t\r\n" " "`' . "\n"
606 . ' rg_notify "spec_deps: ${spec_deps}"' . "\n"
607 606 . ' xecho " DEBUG: name=${spec_name}, ver=${spec_ver}, rel=${spec_rel}"' . "\n" . ' xecho " DEBUG: name=${spec_name}, ver=${spec_ver}, rel=${spec_rel}"' . "\n"
608 607 . ' echo' . "\n" . ' echo' . "\n"
609 608 . '}' . "\n" . '}' . "\n"
 
... ... function start_worker($job)
1524 1523 . ' rg_notify_warn "We do not allow remote packages for security reasons"' . "\n" // TODO: the net is already disabled . ' rg_notify_warn "We do not allow remote packages for security reasons"' . "\n" // TODO: the net is already disabled
1525 1524 . ' continue' . "\n" . ' continue' . "\n"
1526 1525 . ' fi' . "\n" . ' fi' . "\n"
1526 . ' rg_notify "Installing package ${p}"' . "\n"
1527 1527 . ' ${rg_pkg_cmd} "${p}" 2>/tmp/install_pkg.err' . "\n" . ' ${rg_pkg_cmd} "${p}" 2>/tmp/install_pkg.err' . "\n"
1528 1528 . ' [ "${?}" = "0" ] || rg_notify_warn "Cannot install ${p}: "$(< /tmp/install_pkg.err)' . "\n" . ' [ "${?}" = "0" ] || rg_notify_warn "Cannot install ${p}: "$(< /tmp/install_pkg.err)' . "\n"
1529 1529 . ' done' . "\n" . ' done' . "\n"
1530 1530 . ' fi' . "\n" . ' fi' . "\n"
1531 1531 . "\n" . "\n"
1532 . ' rg_notify "Stating build.sh script"' . "\n"
1532 . ' rg_notify "Starting build.sh script"' . "\n"
1533 1533 . ' echo; echo "`date`: Running build.sh script"' . "\n" . ' echo; echo "`date`: Running build.sh script"' . "\n"
1534 1534 . ' date +%s > /mnt/status/build.sh.start' . "\n" // TODO: not read and not exposed? . ' date +%s > /mnt/status/build.sh.start' . "\n" // TODO: not read and not exposed?
1535 1535 . ' su - build -c "bash /mnt/build.sh" &>/mnt/status/build.log' . "\n" . ' su - build -c "bash /mnt/build.sh" &>/mnt/status/build.log' . "\n"
 
... ... function start_worker($job)
1542 1542 . ' break' . "\n" . ' break' . "\n"
1543 1543 . ' fi' . "\n" . ' fi' . "\n"
1544 1544 . "\n" . "\n"
1545 . ' rg_notify "Stating build_rpms.sh script"' . "\n"
1545 . ' rg_notify "Starting build_rpms.sh script"' . "\n"
1546 1546 . ' echo; echo "`date`: Running build_rpms.sh script"' . "\n" . ' echo; echo "`date`: Running build_rpms.sh script"' . "\n"
1547 1547 . ' date +%s > /mnt/T_RPMS_START' . "\n" . ' date +%s > /mnt/T_RPMS_START' . "\n"
1548 1548 . ' su - build -c "bash /mnt/build_rpms.sh" &>/mnt/status/build_rpms.log' . "\n" . ' su - build -c "bash /mnt/build_rpms.sh" &>/mnt/status/build_rpms.log' . "\n"
 
... ... function start_worker($job)
1559 1559 . ' [ -d /mnt/target/rocketgit ] && mv -f /mnt/target/rocketgit /mnt/build2' . "\n" . ' [ -d /mnt/target/rocketgit ] && mv -f /mnt/target/rocketgit /mnt/build2' . "\n"
1560 1560 . ' chown -R build2:build2 /mnt/build2 /mnt/rpmbuild' . "\n" . ' chown -R build2:build2 /mnt/build2 /mnt/rpmbuild' . "\n"
1561 1561 . "\n" . "\n"
1562 . ' rg_notify "Stating build_rgfs.sh script"' . "\n"
1562 . ' rg_notify "Starting build_rgfs.sh script"' . "\n"
1563 1563 . ' echo; echo "`date`: Running build_rgfs.sh script"' . "\n" . ' echo; echo "`date`: Running build_rgfs.sh script"' . "\n"
1564 1564 . ' bash /mnt/build_rgfs.sh &>/mnt/status/build_rgfs.log' . "\n" . ' bash /mnt/build_rgfs.sh &>/mnt/status/build_rgfs.log' . "\n"
1565 1565 . ' if [ "${?}" != "0" ]; then' . "\n" . ' if [ "${?}" != "0" ]; then' . "\n"
 
... ... function start_worker($job)
1567 1567 . ' fi' . "\n" . ' fi' . "\n"
1568 1568 . "\n" . "\n"
1569 1569 . ' if [ -x /mnt/build_repo.sh ]; then' . "\n" . ' if [ -x /mnt/build_repo.sh ]; then' . "\n"
1570 . ' rg_notify "Stating build_repo.sh script"' . "\n"
1570 . ' rg_notify "Starting build_repo.sh script"' . "\n"
1571 1571 . ' echo; echo "`date`: Running build_repo.sh script"' . "\n" . ' echo; echo "`date`: Running build_repo.sh script"' . "\n"
1572 1572 . ' date +%s > /mnt/T_REPO_START' . "\n" . ' date +%s > /mnt/T_REPO_START' . "\n"
1573 1573 . ' su - build2 -c "bash /mnt/build_repo.sh" &>/mnt/status/build_repo.log' . "\n" . ' su - build2 -c "bash /mnt/build_repo.sh" &>/mnt/status/build_repo.log' . "\n"
Date/time (UTC) Type Misc Labels
2021-11-17 19:51 build fedora-34-x86_64 worker/r1 builder/color=fff worker_elap/277s wait_time/638s date/2021-11-17 time/19:35
2021-11-17 19:57 build fedora-35-x86_64 worker/r1 builder/color=fff worker_elap/280s wait_time/620s date/2021-11-17 time/19:41
2021-11-17 20:02 build rocky-8-x86_64 worker/r1 builder/color=fff worker_elap/250s wait_time/662s date/2021-11-17 time/19:46
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:
git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main