X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FPlaceArtifactScripts.java;h=2393c4c8d383ec1f08ede10d3abde2846663b151;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=84161b50bddc73cefb4fc484147b15b3a2279417;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
index 84161b50..2393c4c8 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
@@ -33,124 +33,124 @@ import certman.v1_0.Artifacts.Artifact;
 import certman.v1_0.CertInfo;
 
 public class PlaceArtifactScripts extends ArtifactDir {
-	@Override
-	public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
-		try {
-			// Setup check.sh script
-			String filename = arti.getNs()+".check.sh";
-			File f1 = new File(dir,filename);
-			String email = arti.getNotification() + '\n';
-			if(email.startsWith("mailto:")) {
-				email=email.substring(7);
-			}  else {
-				email=arti.getOsUser() + '\n';
-			}
-			
-			StringBuilder classpath = new StringBuilder();
-			boolean first = true;
-			for(String pth : Split.split(File.pathSeparatorChar, System.getProperty("java.class.path"))) {
-				if(first) {
-					first=false;
-				} else {
-					classpath.append(File.pathSeparatorChar);
-				}
-				File f = new File(pth);
-				classpath.append(f.getCanonicalPath().replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+","*"));
-			}
-			
-			write(f1,Chmod.to644,
-					"#!/bin/bash " + f1.getCanonicalPath()+'\n',
-					"# Certificate Manager Check Script\n",
-					"# Check on Certificate, and renew if needed.\n",
-					"# Generated by Certificate Manager " + Chrono.timeStamp()+'\n',
-					"DIR="+arti.getDir()+'\n',
-					"APP="+arti.getNs()+'\n',
-					"EMAIL="+email,
-					"CP=\""+classpath.toString()+"\"\n",
-					checkScript
-					);
-			
-			// Setup check.sh script
-			File f2 = new File(dir,arti.getNs()+".crontab.sh");
-			write(f2,Chmod.to644,
-					"#!/bin/bash " + f2.getCanonicalPath()+'\n',
-					"# Certificate Manager Crontab Loading Script\n",
-					"# Add/Update a Crontab entry, that adds a check on Certificate Manager generated Certificate nightly.\n",
-					"# Generated by Certificate Manager " + Chrono.timeStamp()+'\n',
-					"TFILE=\"/tmp/cmcron$$.temp\"\n",
-					"DIR=\""+arti.getDir()+"\"\n",
-					"CF=\""+arti.getNs()+" Certificate Check Script\"\n",
-					"SCRIPT=\""+f1.getCanonicalPath()+"\"\n",
-					cronScript
-					);
+    @Override
+    public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
+        try {
+            // Setup check.sh script
+            String filename = arti.getNs()+".check.sh";
+            File f1 = new File(dir,filename);
+            String email = arti.getNotification() + '\n';
+            if(email.startsWith("mailto:")) {
+                email=email.substring(7);
+            }  else {
+                email=arti.getOsUser() + '\n';
+            }
+            
+            StringBuilder classpath = new StringBuilder();
+            boolean first = true;
+            for(String pth : Split.split(File.pathSeparatorChar, System.getProperty("java.class.path"))) {
+                if(first) {
+                    first=false;
+                } else {
+                    classpath.append(File.pathSeparatorChar);
+                }
+                File f = new File(pth);
+                classpath.append(f.getCanonicalPath().replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+","*"));
+            }
+            
+            write(f1,Chmod.to644,
+                    "#!/bin/bash " + f1.getCanonicalPath()+'\n',
+                    "# Certificate Manager Check Script\n",
+                    "# Check on Certificate, and renew if needed.\n",
+                    "# Generated by Certificate Manager " + Chrono.timeStamp()+'\n',
+                    "DIR="+arti.getDir()+'\n',
+                    "APP="+arti.getNs()+'\n',
+                    "EMAIL="+email,
+                    "CP=\""+classpath.toString()+"\"\n",
+                    checkScript
+                    );
+            
+            // Setup check.sh script
+            File f2 = new File(dir,arti.getNs()+".crontab.sh");
+            write(f2,Chmod.to644,
+                    "#!/bin/bash " + f2.getCanonicalPath()+'\n',
+                    "# Certificate Manager Crontab Loading Script\n",
+                    "# Add/Update a Crontab entry, that adds a check on Certificate Manager generated Certificate nightly.\n",
+                    "# Generated by Certificate Manager " + Chrono.timeStamp()+'\n',
+                    "TFILE=\"/tmp/cmcron$$.temp\"\n",
+                    "DIR=\""+arti.getDir()+"\"\n",
+                    "CF=\""+arti.getNs()+" Certificate Check Script\"\n",
+                    "SCRIPT=\""+f1.getCanonicalPath()+"\"\n",
+                    cronScript
+                    );
 
-		} catch (Exception e) {
-			throw new CadiException(e);
-		}
-		return true;
-	}
-	
-	/**
-	 * Note: java.home gets Absolute Path of Java, where we probably want soft links from 
-	 * JAVA_HOME
-	 * @return
-	 */
-	private final static String javaHome() {
-		String rc = System.getenv("JAVA_HOME");
-		return rc==null?System.getProperty("java.home"):rc;
-	}
-	private final static String checkScript = 
-			"> $DIR/$APP.msg\n\n" +
-			"function mailit {\n" +
-			"  if [ -e /bin/mail ]; then\n" +
-			"     MAILER=/bin/mail\n" +
-			"  elif [ -e /usr/bin/mail ]; then \n" +
-			"     MAILER=/usr/bin/mail\n" +
-			"  else \n" +
-			"     MAILER=\"\"\n" +
-			"  fi\n" +
-			" if [ \"$MAILER\" = \"\" ]; then\n" +
-			"    printf \"$*\"\n" +
-			" else \n" +
-			"    printf \"$*\" | $MAILER -s \"AAF Certman Notification for `uname -n`\" $EMAIL\n"+
-			" fi\n" +
-			"}\n\n" +
-			javaHome() + "/bin/" +"java -cp $CP " +
-				Agent.class.getName() + 
-				" cadi_prop_files=$DIR/$APP.props check 2>  $DIR/$APP.STDERR > $DIR/$APP.STDOUT\n" +
-			"case \"$?\" in\n" +
-			"  0)\n" +
-			"    # Note: Validation will be mailed only the first day after any modification\n" +
-			"    if [ \"`find $DIR -mtime 0 -name $APP.check.sh`\" != \"\" ] ; then\n" +
-			"       mailit `echo \"Certficate Validated:\\n\\n\" | cat - $DIR/$APP.msg`\n" +
-			"    else\n" +
-			"       cat $DIR/$APP.msg\n" +
-			"    fi\n" +
-			"    ;;\n" +
-			"  1) mailit \"Error with Certificate Check:\\\\n\\\\nCheck logs $DIR/$APP.STDOUT and $DIR/$APP.STDERR on `uname -n`\"\n" +
-			"    ;;\n" +
-			"  2) mailit `echo \"Certificate Check Error\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
-			"    ;;\n" +
-			"  10) mailit `echo \"Certificate Replaced\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
-			"      if [ -e $DIR/$APP.restart.sh ]; then\n" +
-			"        # Note: it is THIS SCRIPT'S RESPONSIBILITY to notify upon success or failure as necessary!!\n" +
-			"        /bin/sh $DIR/$APP.restart.sh\n" +
-			"      fi\n" +
-			"    ;;\n" +
-			"  *) mailit `echo \"Unknown Error code for CM Agent\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
-			"    ;;\n" +
-			" esac\n\n" +
-			" # Note: make sure to cover this sripts' exit Code\n";
-	
-	private final static String cronScript = 
-			"crontab -l | sed -n \"/#### BEGIN $CF/,/END $CF ####/!p\" > $TFILE\n" +
-			"# Note: Randomize Minutes (0-60) and hours (1-4)\n" +
-			"echo \"#### BEGIN $CF ####\" >> $TFILE\n" +
-			"echo \"$(( $RANDOM % 60)) $(( $(( $RANDOM % 3 )) + 1 )) * * * /bin/bash $SCRIPT " +
-				">> $DIR/cronlog 2>&1 \" >> $TFILE\n" +
-			"echo \"#### END $CF ####\" >> $TFILE\n" +
-			"crontab $TFILE\n" +
-			"rm $TFILE\n";
+        } catch (Exception e) {
+            throw new CadiException(e);
+        }
+        return true;
+    }
+    
+    /**
+     * Note: java.home gets Absolute Path of Java, where we probably want soft links from 
+     * JAVA_HOME
+     * @return
+     */
+    private final static String javaHome() {
+        String rc = System.getenv("JAVA_HOME");
+        return rc==null?System.getProperty("java.home"):rc;
+    }
+    private final static String checkScript = 
+            "> $DIR/$APP.msg\n\n" +
+            "function mailit {\n" +
+            "  if [ -e /bin/mail ]; then\n" +
+            "     MAILER=/bin/mail\n" +
+            "  elif [ -e /usr/bin/mail ]; then \n" +
+            "     MAILER=/usr/bin/mail\n" +
+            "  else \n" +
+            "     MAILER=\"\"\n" +
+            "  fi\n" +
+            " if [ \"$MAILER\" = \"\" ]; then\n" +
+            "    printf \"$*\"\n" +
+            " else \n" +
+            "    printf \"$*\" | $MAILER -s \"AAF Certman Notification for `uname -n`\" $EMAIL\n"+
+            " fi\n" +
+            "}\n\n" +
+            javaHome() + "/bin/" +"java -cp $CP " +
+                Agent.class.getName() + 
+                " cadi_prop_files=$DIR/$APP.props check 2>  $DIR/$APP.STDERR > $DIR/$APP.STDOUT\n" +
+            "case \"$?\" in\n" +
+            "  0)\n" +
+            "    # Note: Validation will be mailed only the first day after any modification\n" +
+            "    if [ \"`find $DIR -mtime 0 -name $APP.check.sh`\" != \"\" ] ; then\n" +
+            "       mailit `echo \"Certficate Validated:\\n\\n\" | cat - $DIR/$APP.msg`\n" +
+            "    else\n" +
+            "       cat $DIR/$APP.msg\n" +
+            "    fi\n" +
+            "    ;;\n" +
+            "  1) mailit \"Error with Certificate Check:\\\\n\\\\nCheck logs $DIR/$APP.STDOUT and $DIR/$APP.STDERR on `uname -n`\"\n" +
+            "    ;;\n" +
+            "  2) mailit `echo \"Certificate Check Error\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
+            "    ;;\n" +
+            "  10) mailit `echo \"Certificate Replaced\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
+            "      if [ -e $DIR/$APP.restart.sh ]; then\n" +
+            "        # Note: it is THIS SCRIPT'S RESPONSIBILITY to notify upon success or failure as necessary!!\n" +
+            "        /bin/sh $DIR/$APP.restart.sh\n" +
+            "      fi\n" +
+            "    ;;\n" +
+            "  *) mailit `echo \"Unknown Error code for CM Agent\\\\n\\\\n\" | cat - $DIR/$APP.msg`\n" +
+            "    ;;\n" +
+            " esac\n\n" +
+            " # Note: make sure to cover this sripts' exit Code\n";
+    
+    private final static String cronScript = 
+            "crontab -l | sed -n \"/#### BEGIN $CF/,/END $CF ####/!p\" > $TFILE\n" +
+            "# Note: Randomize Minutes (0-60) and hours (1-4)\n" +
+            "echo \"#### BEGIN $CF ####\" >> $TFILE\n" +
+            "echo \"$(( $RANDOM % 60)) $(( $(( $RANDOM % 3 )) + 1 )) * * * /bin/bash $SCRIPT " +
+                ">> $DIR/cronlog 2>&1 \" >> $TFILE\n" +
+            "echo \"#### END $CF ####\" >> $TFILE\n" +
+            "crontab $TFILE\n" +
+            "rm $TFILE\n";
 }