summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@test.cacert.org>2018-11-19 20:57:56 +0000
committerroot <root@test.cacert.org>2018-11-19 20:57:56 +0000
commit1b89f2d038a6e55183e55a9c48c29f3ae23edaa6 (patch)
treeca0ac52335e2b2ab01cac2796a79332adce4b44f
parent5a588b00b1ba5d4a19326dc40c3f529218e9b5c5 (diff)
downloadcacert-devel-testserver-1440.tar.gz
cacert-devel-testserver-1440.tar.xz
cacert-devel-testserver-1440.zip
Local changes on the testservertestserver-1440
-rwxr-xr-xCommModule/client.pl6
-rw-r--r--pages/index/feed.rss29
l---------www/cacert1-class3-revoke.crl1
l---------www/cacert1-revoke.crl1
4 files changed, 8 insertions, 29 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index 24f0abc..4c5d6d3 100755
--- a/CommModule/client.pl
+++ b/CommModule/client.pl
@@ -444,9 +444,9 @@ sub calculateDays($)
my @sum = $dbh->selectrow_array("select sum(`awarded`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 AND `notary`.`method` != 'Administrative Increase' AND `notary`.`from` != `notary`.`to` group by `to`");
SysLog("Summe: $sum[0]\n") if($debug);
- return ($sum[0]>=50)?30:3;
+ return ($sum[0]>=50)?730:183;
}
- return 3;
+ return 183;
}
sub X509extractSAN($)
@@ -832,7 +832,7 @@ sub HandleCerts($$)
SysLog "SAN: --$SAN--\n" if($debug);
SysLog "memid: $row{'memid'}\n" if($debug);
- my $days=$org?30:calculateDays($row{"memid"});
+ my $days=$org?365:calculateDays($row{"memid"});
my $md_id = 0;
$md_id = 1 if( $row{'md'} eq "md5");
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index def221f..88a79c9 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -10,9 +10,9 @@
<item>
<title>Looking for confirmation email on creating account?</title>
- <description>Please go to https://ca-mgr1.it-sls.de/login login with your just created account and password. Under MAIL you'll find your individual confirmation email.
+ <description>Please go to https://mgr.test.cacert.org:14843/login login with your just created account and password. Under MAIL you'll find your individual confirmation email.
</description>
- <link>https://ca-mgr1.it-sls.de/testsystemdoc.html</link>
+ <link>https://mgr.test.cacert.orgi:14843/testsystemdoc.html</link>
</item>
<item>
<title>You are interested in helping Testing ?</title>
@@ -20,28 +20,9 @@
<link>https://wiki.cacert.org/Software/CurrentTest</link>
</item>
<item>
- <title>Dear Testers</title>
- <description>We had one work with no activity on the testserver caused by inactivity by the Software-Assessment team, caused by router problems at the hosting site of the testserver. Probably latter has been fixed.
-
- The reported bugs can be categorized into
- 1. Testserver-Mgmt-System related
- 2. Production Server recovery process to Testserver
- 3. general software errors
-
- Group 1+2 are essential for our current test phase, as they covers the problems in building the base testserver environment that is needed for testing.
-
- So language and country selection support is an essential feature we've worked on the last week.
-
- One problem couldn't be solved till today: secondary language selection all other country and language related bugs should be fixed in the meantime.
-
- Also the Show my Points details now has the correct script (after some confusion in the Software-Assessment team and one developer), comparable to the script on the production website.
-
- On the main entry page for testers https://wiki.cacert.org/Software/CurrentTest the updates on the bugs are marked with (i) so here comes the 2nd test round ...
-
- Please report your found bugs and also success reports to the listed bug numbers
-
- Thanks for your assistance .... ;)</description>
- <link>https://cacert1.it-sls.de/</link>
+ <title>CATS Testsystem upload working again</title>
+ <description>Since November 05, 2018 the upload of test results from the CATS testserver to the main testserver is working again. Give it a try!</description>
+ <link>https://cats.test.cacert.org:14843/</link>
</item>
</channel>
</rss>
diff --git a/www/cacert1-class3-revoke.crl b/www/cacert1-class3-revoke.crl
deleted file mode 120000
index 3bcd255..0000000
--- a/www/cacert1-class3-revoke.crl
+++ /dev/null
@@ -1 +0,0 @@
-class3-revoke.crl \ No newline at end of file
diff --git a/www/cacert1-revoke.crl b/www/cacert1-revoke.crl
deleted file mode 120000
index e7b822f..0000000
--- a/www/cacert1-revoke.crl
+++ /dev/null
@@ -1 +0,0 @@
-revoke.crl \ No newline at end of file