RocketGit

catalinux / rocketgit (public) (License: Affero GPLv3) (since 2015-03-19) (hash sha1)

Main RocketGit repo

Clone URLs: https://rocketgit.com/user/catalinux/rocketgit ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit git://git.rocketgit.com/user/catalinux/rocketgit

List of commits:

Subject	Hash	Author	Date (UTC)
totp: Allow also years for 'val' command	d666df0cec948f938469b9eb12a1b981cb41cfa1	Catalin(ux) M. BOIE	2020-01-04 14:39:33
worker: change git clone parameters because we could not clone	8eb2727ac17e12e148f39c72e1f4bd1e31319b33	Catalin(ux) M. BOIE	2019-12-19 03:34:26
Added a TODO for worker	492fb4546829f53adacd74c4647c3634f7c37065	Catalin(ux) M. BOIE	2019-12-18 22:23:12
worker improvements	4387b00291b5848aa08c303f9d62a126a6806a35	Catalin(ux) M. BOIE	2019-12-18 22:17:23
.spec: require tidy for building the tests	c0deab2ce24388c91d2bc2e96338a260c9657dd6	Catalin(ux) M. BOIE	2019-12-18 22:15:29
nginx configuration update	015c9404229f2ff7fb91cc57ab21289f01878334	Catalin(ux) M. BOIE	2019-12-18 21:55:13
Added Business model to comparison	c62d466580aca0ff3371f3ba369959c7ef7631d0	Catalin(ux) M. BOIE	2019-11-21 20:44:16
CSS small correction	ded9ef6bce5bebfa815bc7ae5733bc8e0810af3b	Catalin(ux) M. BOIE	2019-11-21 18:20:41
Added LDAP/qrencode to features/thanks pages	d269d59787f61045f5831c6985899c28da08ebeb	Catalin(ux) M. BOIE	2019-11-21 18:20:22
Invalidate slave table cache when updating the db structure, else new slaves will not be created	8e1bf7feeb87818179e7152a356e0f408da706f2	Catalin(ux) M. BOIE	2019-11-19 19:33:15
docker: push also the latest label	a72e2e74355d772ae45bb99798ad47082390943c	Catalin(ux) M. BOIE	2019-11-19 19:32:11
More statistics changes (load, cpu, mem)	e7f38e72405a227788a7011ea17dd57d0d4de67c	Catalin(ux) M. BOIE	2019-11-19 19:31:24
Cosmetic	0a0b258e8993cb5035e018b049018ac41b99eb01	Catalin(ux) M. BOIE	2019-11-17 11:09:56
Insist on respecting the privacy	b464bcc35476ffa23a83beaf956e8f7b15163d7c	Catalin(ux) M. BOIE	2019-11-17 11:03:36
Remove PayPal donation because of legal uncertainly	cd938af4c5cdbd81190e535973588dee6b697d34	Catalin(ux) M. BOIE	2019-11-17 11:03:07
nginx sample update	1f9eb2d293e91139f397cc45cb206d8994471134	Catalin(ux) M. BOIE	2019-11-17 09:10:02
Mostly cosmetic	3bf09056ede99df46c1b59802e6cf2c7bebf4f13	Catalin(ux) M. BOIE	2019-11-17 09:09:31
Added statistics for the installation	ed743a601cd187431ccd80b57113ba9bb5704035	Catalin(ux) M. BOIE	2019-11-17 09:08:33
ldap: if we have no server, it is useless to continue processing	c022b68a942f471e51cb8343bfef1cda390b27b1	Catalin(ux) M. BOIE	2019-11-16 06:30:47
Do not try to access a repo if is deleted	0a6b1bb704fbeaf60ba053ecc0c323a80f0e397c	Catalin(ux) M. BOIE	2019-11-15 19:49:31

Commit d666df0cec948f938469b9eb12a1b981cb41cfa1 - totp: Allow also years for 'val' command
Author: Catalin(ux) M. BOIE
Author date (UTC): 2020-01-04 14:39
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2020-01-04 14:39
Parent(s): 8eb2727ac17e12e148f39c72e1f4bd1e31319b33
Signing key:
Tree: a89b4e45060e7a812fc611def76f308432e3031b

File	Lines added	Lines deleted
inc/ssh.inc.php	6	4
samples/worker-main.conf.sample	0	0
scripts/builder.sh	0	27

File inc/ssh.inc.php changed (mode: 100644) (index f5c0e48..ca20642)
...	...	function rg_ssh_totp($db, $ip, $uid, $paras)
202	202	} else {	} else {
203	203	$s_expire = array_shift($paras);	$s_expire = array_shift($paras);
204	204	$val = intval($s_expire);	$val = intval($s_expire);
205		if (stristr($s_expire, 'w'))
	205		if (stristr($s_expire, 'y'))
	206		$days = 366 * $val;
	207		else if (stristr($s_expire, 'w'))
206	208	$days = 7 * $val;	$days = 7 * $val;
207	209	else if (stristr($s_expire, 'd'))	else if (stristr($s_expire, 'd'))
208	210	$days = $val;	$days = $val;

...	...	function rg_ssh_totp($db, $ip, $uid, $paras)
309	311	fwrite(STDERR, "\n"	fwrite(STDERR, "\n"
310	312	. 'Posible TOTP commands:' . "\n"	. 'Posible TOTP commands:' . "\n"
311	313	. ' enroll <token> - adds a new device in the system' . "\n"	. ' enroll <token> - adds a new device in the system' . "\n"
312		. ' val <token> [X(w\|d\|h\|m\|s)] - adds your IP to the allow list for X time' . "\n"
313		. ' the default is 1 hour; X is a number; defauls is \'minutes\';' . "\n"
314		. ' w=weeks, d=days, h=hours, m=minutes, and s=seconds' . "\n"
	314		. ' val <token> [X(y\|w\|d\|h\|m\|s)] - adds your IP to the allow list for X time' . "\n"
	315		. ' the default is 1 hour; X is a number (defauls is \'minutes\')' . "\n"
	316		. ' y=years, w=weeks, d=days, h=hours, m=minutes, and s=seconds' . "\n"
315	317	. ' list-val - lists the already validated IPs' . "\n"	. ' list-val - lists the already validated IPs' . "\n"
316	318	. ' inval ip\|all - invalidates IP address(es)' . "\n"	. ' inval ip\|all - invalidates IP address(es)' . "\n"
317	319	. ' remove-device <token> - removes a device from TOTP system' . "\n"	. ' remove-device <token> - removes a device from TOTP system' . "\n"

File samples/worker-main.conf.sample renamed from samples/worker.conf.sample (similarity 100%)

File scripts/builder.sh deleted (index 93fd506..0000000)
1		#!/bin/bash
2
3		# This is a wrapper for builder.php, to not wait a lot after it exits
4
5		. /usr/share/rocketgit/scripts/common.sh
6
7		check_context
8
9		exec 100<>/var/lib/rocketgit/locks/builder.sh.lock
10
11		flock --exclusive --nonblock 100
12		if [ "${?}" != "0" ]; then
13		exit 0
14		fi
15
16		while [ 1 ]; do
17		php /usr/share/rocketgit/scripts/builder.php
18
19		# in case of errors, we will wait, to not go into an infinite loop
20		if [ "${?}" != "0" ]; then
21		sleep 10
22		else
23		sleep 1
24		fi
25		done
26
27		flock --unlock 100

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