diff --git a/README.dependencies b/README.dependencies index 644109e..b5bde04 100644 --- a/README.dependencies +++ b/README.dependencies @@ -34,5 +34,3 @@ and configure our Maven build environments to read from that repository. However ever needed a local package included in our builds and we do not have a local repository solution in place. The use of the local cache for this is a reasonable approach for now given that this application is only built locally by a few users who have access to the build server. - - diff --git a/ansible/README b/ansible/README index f169a24..9ab9d1e 100644 --- a/ansible/README +++ b/ansible/README @@ -27,7 +27,7 @@ On the target: /logs/cs/ /www/ (?) /data/local/cs - + 3) tomcat config a) configure tomcat to run as user=iamcert b) assure that /etc/daemons/tomcat includes: -Dcs.properties.path=file:/data/local/cs @@ -42,17 +42,16 @@ On the target: Install -------- - + 1) Make the package. In base product directory: ( with a java 1.8 compiler ) $ mvn clean package -2) To install the service: +2) To install the service: ( host_type = eval | prod ) - + $ ./install.sh app 3) To install the utilities: $ ./install.sh util - diff --git a/ansible/apache/http.j2 b/ansible/apache/http.j2 index aa6a242..e052527 100644 --- a/ansible/apache/http.j2 +++ b/ansible/apache/http.j2 @@ -8,4 +8,3 @@ RewriteCond %{SERVER_PORT} 80 RewriteCond %{REQUEST_URI} ^/cs* RewriteRule ^(.*)$ https://{{ cluster_name }}/$1 [R,L] - diff --git a/ansible/apache/https.j2 b/ansible/apache/https.j2 index 09113be..e533df0 100644 --- a/ansible/apache/https.j2 +++ b/ansible/apache/https.j2 @@ -66,6 +66,3 @@ Options -MultiViews order allow,deny allow from all - - - diff --git a/ansible/hosts b/ansible/hosts index c730d2f..2597ea2 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -13,7 +13,7 @@ apps="cs" ansible_ssh_group=iam-dev -[eval] +[eval] iamtools-test11.s.uw.edu idle_wait_sec=10 wd_cron_offset=01 [eval:vars] diff --git a/ansible/install-util.yml b/ansible/install-util.yml index 43570cf..86d7f6b 100644 --- a/ansible/install-util.yml +++ b/ansible/install-util.yml @@ -52,6 +52,3 @@ - name: pw notify crontab cron: name="pwnotify" disabled={{cluster_type != 'prod'}} hour="01" minute="01" day="01" month="1,3,5,7,9,11" job="{{ cs_root }}/util/pw-notify.sh >> /dev/null 2>&1" - - - diff --git a/cs.properties.eval b/cs.properties.eval index 58824ef..b5be308 100644 --- a/cs.properties.eval +++ b/cs.properties.eval @@ -1,4 +1,4 @@ -# EVAL certservice properties +# EVAL certservice properties # # cs will look for this file first in the cs directory # if that is undefined or not found this installed copy will be used @@ -44,4 +44,3 @@ cs.browserRoot=/cs cs.certRoot=/cs/ws cs.gws.urltemplate=https://eval.groups.uw.edu/group_sws/v3/group/u_weblogin_dns-owners_%s/effective_member - diff --git a/cs.properties.prod b/cs.properties.prod index d916fb8..db41e0b 100644 --- a/cs.properties.prod +++ b/cs.properties.prod @@ -1,4 +1,4 @@ -# EVAL certservice properties +# EVAL certservice properties # # cs will look for this file first in the cs directory # if that is undefined or not found this installed copy will be used diff --git a/cs.properties.tmpl b/cs.properties.tmpl index 1762529..fa4ec7e 100644 --- a/cs.properties.tmpl +++ b/cs.properties.tmpl @@ -1,4 +1,4 @@ -# EVAL certservice properties +# EVAL certservice properties # # cs will look for this file first in the cs directory # if that is undefined or not found this installed copy will be used diff --git a/src/main/java/edu/washington/iam/tools/WebClient.java.dist b/src/main/java/edu/washington/iam/tools/WebClient.java.dist index aa12a50..44e7706 100644 --- a/src/main/java/edu/washington/iam/tools/WebClient.java.dist +++ b/src/main/java/edu/washington/iam/tools/WebClient.java.dist @@ -74,7 +74,7 @@ public class WebClient { private final Logger log = LoggerFactory.getLogger(getClass()); private final ReentrantReadWriteLock locker = new ReentrantReadWriteLock(); - + // connection params private String certFile = null; private String keyFile = null; @@ -85,16 +85,16 @@ public class WebClient { private boolean initialized = false; private DocumentBuilder documentBuilder; - // - private String soapHeader = "" + - "" + + "" + ""; private String soapTrailer = ""; - // "SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">" + + // "SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">" + // "xmlns:tns=\"http://ssl.ws.epki.comodo.com/\" " + @@ -104,7 +104,7 @@ public class WebClient { connectionManager.closeIdleConnections(30, TimeUnit.SECONDS); } - + public Element doSoapRequest(String url, String action, String body) throws SocketTimeoutException, WebClientException { @@ -116,7 +116,7 @@ public class WebClient { HttpConnectionParams.setConnectionTimeout(httpParams, queryTimeLimit); HttpConnectionParams.setSoTimeout(httpParams, queryTimeLimit); DefaultHttpClient httpclient = new DefaultHttpClient((ClientConnectionManager)connectionManager, httpParams); - // httpclient.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false); + // httpclient.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false); // log.debug(" url: " + url); // log.debug("content: [" + soapHeader + body + soapTrailer + "]"); @@ -126,14 +126,14 @@ public class WebClient { StringEntity strent= new StringEntity(soapHeader + body + soapTrailer); strent.setContentType("text/xml; charset=utf-8"); - httppost.setEntity(strent); + httppost.setEntity(strent); HttpResponse response = httpclient.execute(httppost); if (response.getStatusLine().getStatusCode()>=400) { log.error("soap error: " + response.getStatusLine().getStatusCode() + " = " + response.getStatusLine().getReasonPhrase()); return null; - } + } HttpEntity entity = response.getEntity(); // null is error - should get something @@ -144,7 +144,7 @@ public class WebClient { // log.debug("got " + entity.getContentLength() + " bytes"); // parse response text Document doc = documentBuilder.parse(entity.getContent()); - + Element ele = XMLHelper.getElementByName(doc.getDocumentElement(), "Body"); if (ele == null) { log.error("no body element"); @@ -293,7 +293,7 @@ public class WebClient { String feature = "http://apache.org/xml/features/nonvalidating/load-external-dtd"; domFactory.setFeature(feature, false); documentBuilder = domFactory.newDocumentBuilder(); - + } catch (ParserConfigurationException e) { log.error("javax.xml.parsers.ParserConfigurationException: " + e); } @@ -335,4 +335,3 @@ public class WebClient { } } - diff --git a/src/main/java/edu/washington/iam/ws/cabroker/exception/mk b/src/main/java/edu/washington/iam/ws/cabroker/exception/mk index 0e58716..1508d5e 100755 --- a/src/main/java/edu/washington/iam/ws/cabroker/exception/mk +++ b/src/main/java/edu/washington/iam/ws/cabroker/exception/mk @@ -7,8 +7,8 @@ class=$1 exit 1 } -case $class in - *Exception ) +case $class in + *Exception ) ;; *) class="${class}Exception"; ;; @@ -51,4 +51,3 @@ public class $class extends Exception { } } END - diff --git a/src/main/java/edu/washington/iam/ws/cabroker/registry/DB.schema b/src/main/java/edu/washington/iam/ws/cabroker/registry/DB.schema index 5860368..9a50f8e 100644 --- a/src/main/java/edu/washington/iam/ws/cabroker/registry/DB.schema +++ b/src/main/java/edu/washington/iam/ws/cabroker/registry/DB.schema @@ -1,5 +1,5 @@ -- --- certificate broker +-- certificate broker --- create table certificate ( @@ -51,4 +51,3 @@ create table db_ts ( cert_update_time bigint ); ALTER TABLE public.db_ts OWNER TO ca; - diff --git a/src/main/java/edu/washington/iam/ws/cabroker/registry/uwca.sql b/src/main/java/edu/washington/iam/ws/cabroker/registry/uwca.sql index b639357..c5684d8 100644 --- a/src/main/java/edu/washington/iam/ws/cabroker/registry/uwca.sql +++ b/src/main/java/edu/washington/iam/ws/cabroker/registry/uwca.sql @@ -1,3 +1,2 @@ select svreq.reqno,request_date,dn,expire_date from svreq,svcrt where svreq.reqno=svcrt.reqno and svreq.status=2 and svcrt.status=0 limit 20; - diff --git a/src/main/webapp/WEB-INF/.gitignore b/src/main/webapp/WEB-INF/.gitignore index 80edaf1..8066201 100644 --- a/src/main/webapp/WEB-INF/.gitignore +++ b/src/main/webapp/WEB-INF/.gitignore @@ -1,2 +1,2 @@ cs.properties -cs-secrets.properties \ No newline at end of file +cs-secrets.properties diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml index 42b4e15..6d41629 100644 --- a/src/main/webapp/WEB-INF/applicationContext.xml +++ b/src/main/webapp/WEB-INF/applicationContext.xml @@ -109,7 +109,7 @@ managed by UW-IT. You are receiving this message because you requested this cert certificate's common name or one of its alternative names. Requests for changes to the contact list for your DNS name(s) should be emailed to netops@uw.edu. "/> - + diff --git a/src/main/webapp/WEB-INF/velocity/browser/cert.vm b/src/main/webapp/WEB-INF/velocity/browser/cert.vm index 7fe6374..00bf540 100644 --- a/src/main/webapp/WEB-INF/velocity/browser/cert.vm +++ b/src/main/webapp/WEB-INF/velocity/browser/cert.vm @@ -16,7 +16,7 @@ *# ## -## cert detail +## cert detail ## @@ -111,7 +111,7 @@ $!{cert.pemCert} - diff --git a/src/main/webapp/WEB-INF/velocity/crumbs.vm b/src/main/webapp/WEB-INF/velocity/crumbs.vm index c6cb25f..36ca6b3 100644 --- a/src/main/webapp/WEB-INF/velocity/crumbs.vm +++ b/src/main/webapp/WEB-INF/velocity/crumbs.vm @@ -51,7 +51,7 @@ function crumbSearch() { } - +
diff --git a/src/main/webapp/WEB-INF/velocity/definitions.vm b/src/main/webapp/WEB-INF/velocity/definitions.vm index 06ee951..42ab3ec 100644 --- a/src/main/webapp/WEB-INF/velocity/definitions.vm +++ b/src/main/webapp/WEB-INF/velocity/definitions.vm @@ -25,5 +25,3 @@ #set ( $nowrap = 'nowrap="nowrap"' ) #set ( $waitCursor = 'document.body.style.cursor="wait";' ) #set ( $defaultCursor = 'document.body.style.cursor="default";' ) - - diff --git a/src/main/webapp/WEB-INF/velocity/empty.vm b/src/main/webapp/WEB-INF/velocity/empty.vm index ff4d911..65234ad 100644 --- a/src/main/webapp/WEB-INF/velocity/empty.vm +++ b/src/main/webapp/WEB-INF/velocity/empty.vm @@ -16,7 +16,7 @@ *# + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ## groups webservice (really simple error page) @@ -40,4 +40,3 @@ - diff --git a/src/main/webapp/WEB-INF/velocity/innerhtml/certs.vm b/src/main/webapp/WEB-INF/velocity/innerhtml/certs.vm index 8817a9e..d198660 100644 --- a/src/main/webapp/WEB-INF/velocity/innerhtml/certs.vm +++ b/src/main/webapp/WEB-INF/velocity/innerhtml/certs.vm @@ -49,4 +49,3 @@ #end - diff --git a/src/main/webapp/WEB-INF/velocity/innerhtml/dns.vm b/src/main/webapp/WEB-INF/velocity/innerhtml/dns.vm index 4455a37..9e3af2c 100644 --- a/src/main/webapp/WEB-INF/velocity/innerhtml/dns.vm +++ b/src/main/webapp/WEB-INF/velocity/innerhtml/dns.vm @@ -29,4 +29,3 @@

$sub NOT an owner of the domain. #end - diff --git a/src/main/webapp/WEB-INF/velocity/innerhtml/new.vm b/src/main/webapp/WEB-INF/velocity/innerhtml/new.vm index 62c32e2..63d7b34 100644 --- a/src/main/webapp/WEB-INF/velocity/innerhtml/new.vm +++ b/src/main/webapp/WEB-INF/velocity/innerhtml/new.vm @@ -30,4 +30,3 @@

#end - diff --git a/src/main/webapp/WEB-INF/velocity/innerhtml/renew.vm b/src/main/webapp/WEB-INF/velocity/innerhtml/renew.vm index 2c84658..4b86179 100644 --- a/src/main/webapp/WEB-INF/velocity/innerhtml/renew.vm +++ b/src/main/webapp/WEB-INF/velocity/innerhtml/renew.vm @@ -31,4 +31,3 @@
Identifier:$!{cert.caId}
#end - diff --git a/src/main/webapp/WEB-INF/velocity/json/ts.vm b/src/main/webapp/WEB-INF/velocity/json/ts.vm index 5333230..9663cdc 100644 --- a/src/main/webapp/WEB-INF/velocity/json/ts.vm +++ b/src/main/webapp/WEB-INF/velocity/json/ts.vm @@ -21,4 +21,3 @@ { "timestamp": "${ts}" } - diff --git a/src/main/webapp/WEB-INF/velocity/plain/home.vm b/src/main/webapp/WEB-INF/velocity/plain/home.vm index 3bf7980..909d4ce 100644 --- a/src/main/webapp/WEB-INF/velocity/plain/home.vm +++ b/src/main/webapp/WEB-INF/velocity/plain/home.vm @@ -16,7 +16,7 @@ *# ## -## Template for API home page +## Template for API home page ##
@@ -28,4 +28,3 @@
$!{status}
- diff --git a/src/main/webapp/WEB-INF/velocity/plain/page.vm b/src/main/webapp/WEB-INF/velocity/plain/page.vm index eba68f0..26b2ebb 100644 --- a/src/main/webapp/WEB-INF/velocity/plain/page.vm +++ b/src/main/webapp/WEB-INF/velocity/plain/page.vm @@ -16,7 +16,7 @@ *# + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ## groups webservice (main page) @@ -32,4 +32,3 @@ - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 9fd8b98..0a31d88 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ @@ -44,5 +44,3 @@ - - diff --git a/src/main/webapp/css/cs.css b/src/main/webapp/css/cs.css index e25e2a8..3944d90 100644 --- a/src/main/webapp/css/cs.css +++ b/src/main/webapp/css/cs.css @@ -31,7 +31,7 @@ #rightsubbanner .dijitTextBox { width: 120px; } - + #rightsubbanner .dijitButtonNode { color: #000000; font-size: 9pt; @@ -39,7 +39,7 @@ background: transparent; border: 2px; } - + #rightsubbanner .sublist a { color: #00006b; font-style: normal; @@ -72,5 +72,3 @@ margin-top: 12px; margin: 6px 0 0 0; } - - diff --git a/src/main/webapp/css/iam-dojo-2.css b/src/main/webapp/css/iam-dojo-2.css index d7941c4..15e5c45 100644 --- a/src/main/webapp/css/iam-dojo-2.css +++ b/src/main/webapp/css/iam-dojo-2.css @@ -58,14 +58,14 @@ h2 {font-family: "Helvetica","Arial",sans-serif; margin: 8px 0 8px 4px; padding: 0 0 0 0; } - + h3 {font-family: "Helvetica","Arial",sans-serif; color: #303030; font-size: 1.3em; margin: 8px 0 8px 4px; padding: 0 0 0 0; } - + h4 {font-family: "Helvetica","Arial",sans-serif; color: #303030; font-size: 1.1em; @@ -99,7 +99,7 @@ fieldset .h3 {font-family: "Helvetica","Arial",sans-serif; margin: 6px 0 2px 4px; padding: 0 0 0 0; } - + fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; color: #303030; font-size: 1.0em; @@ -361,7 +361,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; #banner #subbanner .dijitTextBox { width: 120px; } - + #banner #subbanner .dijitButtonNode { color: #000000; font-size: medium; @@ -369,7 +369,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; background: transparent; border: 2px; } - + #banner #zzzsubbanner ul li a { color: #000000; display: inline; @@ -814,7 +814,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; .tabbox .dijitTextBox { width: 120px; } - + .tabbox .dijitButtonNode { color: #000000; font-size: medium; @@ -822,7 +822,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; background: transparent; border: 2px; } - + .tabbox ul { white-space: nowrap; margin: 2px 0 1px 10px; @@ -985,7 +985,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; .claro .xbutton .dijitButtonText { padding:0 .25em 0 .25em } - + .iamtable { border-collapse: collapse; border: 0 0 0 0; @@ -1069,7 +1069,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; font-family: monospace; font-size:xx-small; color: #404000; -} +} .iamtable .altname { font-style: italic; font-size: 1.0em; @@ -1129,7 +1129,7 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; } .friendlyname { - font-size:90% + font-size:90% } .plaintable td a:link, td .plaintable a:visited, td .plaintable a:hover, td .plaintable a:active { @@ -1172,11 +1172,11 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; } .ca_uw { - color: #300740; + color: #300740; } .ca_uw { - color: #300740; + color: #300740; } .ca_ic { color: #004032; @@ -1209,8 +1209,8 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; font-family: monospace; font-size:.5em; color: #404000; -} - +} + .plainlink a:link a:visited a:active {color: #00008b; font-style: italic; text-decoration: underline; @@ -1242,5 +1242,3 @@ fieldset .h4 {font-family: "Helvetica","Arial",sans-serif; margin:2px 0; padding:5px 0; } - - diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 36049be..a80724b 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -9,4 +9,3 @@ Version v1

- diff --git a/src/main/webapp/js/Dialog.js b/src/main/webapp/js/Dialog.js index 601e0ab..02dda77 100644 --- a/src/main/webapp/js/Dialog.js +++ b/src/main/webapp/js/Dialog.js @@ -125,10 +125,10 @@ define([ }); } else console.log('over node not found'); } - + // show and position this.inherited(arguments); - + if (placeNode!=null) { ds.set(this.domNode, { right: '40px' @@ -137,7 +137,7 @@ define([ var dw = dp.position(this.domNode,true).w; var dx = dp.position(this.domNode,true).x; console.log('dialog show complete x=' + dx + ' w=' + dw); - + // drop buttons if not wanted if (this.submitLabel=='') { ds.set(this.submitButtonNode, { @@ -160,4 +160,3 @@ define([ } }); }); - diff --git a/src/main/webapp/js/iam-dojo.js b/src/main/webapp/js/iam-dojo.js index e08d769..efc947b 100644 --- a/src/main/webapp/js/iam-dojo.js +++ b/src/main/webapp/js/iam-dojo.js @@ -54,7 +54,7 @@ require([ "dojo/dom-construct", "dojo/query", "dijit/focus", - "dojo/cookie", + "dojo/cookie", "dojo/dom-geometry", "dojo/dom-style", "dojo/request/xhr", @@ -83,9 +83,9 @@ String.prototype.trim = function () { } -/** +/** ** Standard dialog and alert tools - ** + ** **/ // safe focus @@ -117,7 +117,7 @@ function iam_hideTheDialog(d) { function iam_loadTheDialog(d, html) { var cdiv = d + 'Content'; iam_getRequest(html, {'Accept': 'text/xml'}, 'text', function(data, args) { - // set the container height + // set the container height var bx = dojoWindow.getBox(); var bh2 = (bx.h)/2; var fdd = dojoDom.byId(cdiv); @@ -190,7 +190,7 @@ function iam_bannerNotice(msg) { }).play(); }); } - + // better alert tools // show a formatted message @@ -224,8 +224,8 @@ function iam_makeOkXml(str) { return str.replace(/&/g,'&').replace(//g,'>').replace(/'/g,''').replace(/"/g,'"'); } -/** - ** Hash tools +/** + ** Hash tools **/ var _hashCookie = 'iamhash'; @@ -252,7 +252,7 @@ function iam_hashSetCurrent(t, v) { if (n) { console.log('setting hash cookie'); dojoDoc.location.hash = _hashCurrentTab + _hashCurrentValue; - dojoCookie(_hashCookie, '#' + _hashCurrentTab + _hashCurrentValue, {path:'/'}); + dojoCookie(_hashCookie, '#' + _hashCurrentTab + _hashCurrentValue, {path:'/'}); } } @@ -261,7 +261,7 @@ function iam_hashSetCurrent(t, v) { function iam_hashHandler(hsh) { console.log('iamhashhandler: ' + hsh); - if (_hashHandler==null) return; + if (_hashHandler==null) return; if ( typeof(hsh) == 'undefined') hsh = ''; // var h = dojoDoc.location.hash; @@ -298,7 +298,7 @@ require(["dojo/hash", "dojo/topic"], function(hash, topic){ -/** +/** ** Ajax requests **/ @@ -400,7 +400,7 @@ function iam_deleteRequest(url, headers, handleas, postRequest) { } -/** +/** ** Basic window part sizing ** ( Index on left, display on right ) **/ @@ -419,7 +419,7 @@ function iam_setPanelSizes() { var fh = dojoGeom.position(dojoDom.byId('footer'),true).h; console.log('vh='+v_viewport.h+' vw='+v_viewport.w+' tbh='+tbh+' bh='+bh+' fh='+fh); - var ch = v_viewport.h - tbh - bh - fh; + var ch = v_viewport.h - tbh - bh - fh; var cw = v_viewport.w; var ct = tbh + bh + 30; console.log('ch='+ch+' cw='+cw+' ct='+ct); @@ -475,4 +475,3 @@ function iam_set(p, v) { if (p=='hashCookie') _hashCookie = v; if (p=='hashHandler') _hashHandler = v; } - diff --git a/src/main/webapp/js/templates/Dialog.html b/src/main/webapp/js/templates/Dialog.html index d4618d8..035b81c 100644 --- a/src/main/webapp/js/templates/Dialog.html +++ b/src/main/webapp/js/templates/Dialog.html @@ -18,4 +18,3 @@

- diff --git a/util/README.password b/util/README.password index 9e1907e..4393082 100644 --- a/util/README.password +++ b/util/README.password @@ -16,7 +16,7 @@ The password is in: /data/local/etc/comodo.pw (remember somewhere the old password) [ I try to do this at the same time on both iamtools21 and iamtools22. - The others you can delay. ] + The others you can delay. ] 2) log in to the manager @@ -43,4 +43,3 @@ The password is in: /data/local/etc/comodo.pw 8) test: /data/local/cs/util/incommon/test_pw.sh - diff --git a/util/README.python b/util/README.python index b7b4dcb..cf060ce 100644 --- a/util/README.python +++ b/util/README.python @@ -3,5 +3,3 @@ These tools need python3 as follows: $ virtualenv -p python3 env $ . ./env/bin/activate $ pip -install -r requirements.txt - - diff --git a/util/certlib.sh.j2 b/util/certlib.sh.j2 index 813962a..18fd9b0 100644 --- a/util/certlib.sh.j2 +++ b/util/certlib.sh.j2 @@ -10,7 +10,7 @@ function cron_status { do [[ $peer < $self ]] && { - ct="`ssh $peer 'crontab -l' | egrep -e \"^[^#].*/$1\"`" + ct="`ssh $peer 'crontab -l' | egrep -e \"^[^#].*/$1\"`" [[ -n $ct ]] && { echo "backup" return @@ -36,4 +36,3 @@ function exit_if_not_master { function send_mail { echo "$3" | /usr/bin/Mail -s "$2" $1 } - diff --git a/util/certs_warn.py b/util/certs_warn.py index 2d26d5a..e5a08e3 100644 --- a/util/certs_warn.py +++ b/util/certs_warn.py @@ -36,7 +36,7 @@ def warn_expiring(): print(cert[1] + '\n') -# +# # ---------------- warn main ------------------------- # diff --git a/util/certs_warn.sh b/util/certs_warn.sh index ef35680..4dc05f7 100755 --- a/util/certs_warn.sh +++ b/util/certs_warn.sh @@ -35,5 +35,3 @@ then fi send_mail cert-dev@uw.edu "expire certs notices" "$certs" - - diff --git a/util/incommon/README.db b/util/incommon/README.db index c73b9ea..94bbbbf 100644 --- a/util/incommon/README.db +++ b/util/incommon/README.db @@ -31,5 +31,3 @@ note the new id = 9870 [ history ] # insert into history values (9870, 1, '07/29/2017', 'morgen'); - - diff --git a/util/incommon/client.py b/util/incommon/client.py index 9e16778..b7dbedd 100644 --- a/util/incommon/client.py +++ b/util/incommon/client.py @@ -2,7 +2,7 @@ import sys -# wsdl +# wsdl from suds.client import Client from comodo_lib import ComodoSSLClient @@ -11,7 +11,7 @@ client,auth = ComodoSSLClient() arg = getOneArg(False, 'method_name') - + if arg!=None: method = client.factory.create(arg) print(method) diff --git a/util/incommon/comodo_lib.py b/util/incommon/comodo_lib.py index 09a1bfc..fa2157d 100644 --- a/util/incommon/comodo_lib.py +++ b/util/incommon/comodo_lib.py @@ -2,7 +2,7 @@ import sys -# wsdl +# wsdl from suds.client import Client # xml parser @@ -45,5 +45,3 @@ def getOneArg(req, argtext): if len(sys.argv)==1: return None return sys.argv[1] - - diff --git a/util/incommon/getCert.py b/util/incommon/getCert.py index 70f7fe7..8fa017b 100644 --- a/util/incommon/getCert.py +++ b/util/incommon/getCert.py @@ -2,7 +2,7 @@ import sys -# wsdl +# wsdl from suds.client import Client from comodo_lib import ComodoSSLClient @@ -11,7 +11,7 @@ client,auth = ComodoSSLClient() arg = getOneArg(True, 'cert_id') - + result = client.service.collect(auth, int(arg), 1) print(result) diff --git a/util/incommon/getCertTypes.py b/util/incommon/getCertTypes.py index f117935..0060bda 100644 --- a/util/incommon/getCertTypes.py +++ b/util/incommon/getCertTypes.py @@ -1,6 +1,6 @@ # get available cert types -# wsdl +# wsdl from suds.client import Client from comodo_lib import ComodoSSLClient diff --git a/util/incommon/getRenewed.py b/util/incommon/getRenewed.py index 13c0b26..ab89174 100644 --- a/util/incommon/getRenewed.py +++ b/util/incommon/getRenewed.py @@ -4,7 +4,7 @@ import logging logging.basicConfig() -# wsdl +# wsdl from suds.client import Client from comodo_lib import ComodoSSLClient @@ -13,7 +13,7 @@ client,auth = ComodoSSLClient() arg = getOneArg(True, 'renew_id') - + print('[%s]' % arg) result = client.service.collectRenewed(arg, 1) diff --git a/util/incommon/getStatus.py b/util/incommon/getStatus.py index 277bbc4..2d678df 100644 --- a/util/incommon/getStatus.py +++ b/util/incommon/getStatus.py @@ -2,7 +2,7 @@ import sys -# wsdl +# wsdl from suds.client import Client from comodo_lib import ComodoSSLClient @@ -11,7 +11,7 @@ client,auth = ComodoSSLClient() arg = getOneArg(True, 'cert_id') - + result = client.service.getCollectStatus(auth, int(arg)) print(result) diff --git a/util/incommon/test_pw.sh b/util/incommon/test_pw.sh index 2e5d3a3..42353af 100755 --- a/util/incommon/test_pw.sh +++ b/util/incommon/test_pw.sh @@ -13,4 +13,3 @@ res="`python getCertTypes.py | grep 'InCommon Wildcard SSL Certificate'`" } echo "password fails" exit 1 - diff --git a/util/install.py b/util/install.py index 6cd4fa6..a0a2439 100644 --- a/util/install.py +++ b/util/install.py @@ -6,4 +6,3 @@ sources = ['certs_warn.py', 'certs_util_lib.py'] for s in sources: py_compile.compile(s, '/data/local/bin/' + s + 'c') - diff --git a/util/install.sh b/util/install.sh index e6f7365..74d3e97 100755 --- a/util/install.sh +++ b/util/install.sh @@ -1,9 +1,8 @@ #!/bin/bash -set -x +set -x export PYTHONPATH=/data/local/lib/python2.6/site-packages/ -/usr/local/bin/python2.6 install.py +/usr/local/bin/python2.6 install.py cp certs_warn.sh /data/local/bin - diff --git a/util/owners.py b/util/owners.py index 848ec8c..20ce143 100644 --- a/util/owners.py +++ b/util/owners.py @@ -37,4 +37,3 @@ owners = certificateHelper.find_dns_owners(options.dnsname) for owner in owners: print(owner) - diff --git a/util/pw-notify.sh b/util/pw-notify.sh index 1755ba8..04da7fa 100644 --- a/util/pw-notify.sh +++ b/util/pw-notify.sh @@ -21,4 +21,3 @@ on either iamtools11 or iamtools12. You have a week or so to get this done. END - diff --git a/util/trim_logs.sh b/util/trim_logs.sh index fc0ae6b..9ae54e0 100644 --- a/util/trim_logs.sh +++ b/util/trim_logs.sh @@ -8,4 +8,3 @@ cd /logs/cs find . -maxdepth 1 -name 'process-*.log' -mtime +30 -delete # any other run logs? -