Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

minor dns subdomain fix.

  • Loading branch information...
commit 145750631c3867ff2b76f3b5a213ec26ead8faaa 1 parent 5e66801
Neil authored
View
2  clc/modules/core/src/main/java/com/eucalyptus/util/DNSProperties.java
@@ -53,7 +53,7 @@
public static int PORT = 53;
public static int MAX_MESSAGE_SIZE = 1024;
public static String DNS_REF = "vm://DNSControlInternal";
- public static String DOMAIN = "localdomain";
+ public static String DOMAIN = "localhost";
public static String NS_HOST = "nshost." + DOMAIN;
public static String NS_IP = "127.0.0.1";
View
2  clc/modules/core/src/main/java/com/eucalyptus/util/WalrusProperties.java
@@ -49,7 +49,7 @@
public static final String SERVICE_NAME = "Walrus";
public static final String VIRTUAL_SUBDOMAIN = "I_R_Bukkit";
- public static String WALRUS_DOMAIN = "walrus.localhost";
+ public static String WALRUS_SUBDOMAIN = "walrus";
public static String WALRUS_IP = "127.0.0.1";
public static final long G = 1024*1024*1024;
public static final long M = 1024*1024;
View
16 clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java
@@ -114,8 +114,8 @@ public DNSControl() {}
public UpdateARecordResponseType UpdateARecord(UpdateARecordType request) throws EucalyptusCloudException {
UpdateARecordResponseType reply = (UpdateARecordResponseType) request.getReply();
- String zone = request.getZone();
- String name = request.getName();
+ String zone = request.getZone() + DNSProperties.DOMAIN + ".";
+ String name = request.getName() + DNSProperties.DOMAIN + ".";
String address = request.getAddress();
long ttl = request.getTtl();
/*if(!request.isAdministrator()) {
@@ -163,8 +163,8 @@ public UpdateARecordResponseType UpdateARecord(UpdateARecordType request) throw
public RemoveARecordResponseType RemoveARecord(RemoveARecordType request) throws EucalyptusCloudException {
RemoveARecordResponseType reply = (RemoveARecordResponseType) request.getReply();
- String zone = request.getZone();
- String name = request.getName();
+ String zone = request.getZone() + DNSProperties.DOMAIN + ".";
+ String name = request.getName() + DNSProperties.DOMAIN + ".";
/*if(!request.isAdministrator()) {
throw new AccessDeniedException(name);
} */
@@ -197,8 +197,8 @@ public AddZoneResponseType AddZone(AddZoneType request) throws EucalyptusCloudEx
public UpdateCNAMERecordResponseType UpdateCNAMERecord(UpdateCNAMERecordType request) throws EucalyptusCloudException {
UpdateCNAMERecordResponseType reply = (UpdateCNAMERecordResponseType) request.getReply();
- String zone = request.getZone();
- String name = request.getName();
+ String zone = request.getZone() + DNSProperties.DOMAIN + ".";
+ String name = request.getName() + DNSProperties.DOMAIN + ".";
String alias = request.getAlias();
long ttl = request.getTtl();
/*if(!request.isAdministrator()) {
@@ -247,8 +247,8 @@ public UpdateCNAMERecordResponseType UpdateCNAMERecord(UpdateCNAMERecordType req
public RemoveCNAMERecordResponseType RemoveCNAMERecord(RemoveCNAMERecordType request) throws EucalyptusCloudException {
RemoveCNAMERecordResponseType reply = (RemoveCNAMERecordResponseType) request.getReply();
- String zone = request.getZone();
- String name = request.getName();
+ String zone = request.getZone() + DNSProperties.DOMAIN + ".";
+ String name = request.getName() + DNSProperties.DOMAIN + ".";
/*if(!request.isAdministrator()) {
throw new AccessDeniedException(name);
} */
View
4 clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java
@@ -217,7 +217,7 @@ public CreateBucketResponseType createBucket(CreateBucketType request) throws Eu
UpdateARecordType updateARecord = new UpdateARecordType();
updateARecord.setUserId(userId);
String address = WalrusProperties.WALRUS_IP;
- String zone = WalrusProperties.WALRUS_DOMAIN + ".";
+ String zone = WalrusProperties.WALRUS_SUBDOMAIN + ".";
updateARecord.setAddress(address);
updateARecord.setName(bucketName + "." + zone);
updateARecord.setTtl(604800);
@@ -272,7 +272,7 @@ public DeleteBucketResponseType deleteBucket(DeleteBucketType request) throws Eu
if(WalrusProperties.enableVirtualHosting) {
RemoveARecordType removeARecordType = new RemoveARecordType();
removeARecordType.setUserId(userId);
- String zone = WalrusProperties.WALRUS_DOMAIN + ".";
+ String zone = WalrusProperties.WALRUS_SUBDOMAIN + ".";
removeARecordType.setName(bucketName + "." + zone);
removeARecordType.setZone(zone);
LOG.info("Removing mapping for " + removeARecordType.getName());
Please sign in to comment.
Something went wrong with that request. Please try again.