zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 01:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

7.7.3 (#39)

Browse Source 
* ARM templates - 7.7.3 support added. Pro and JCR

* ARM templates - Xray 3.8.2 support

* ARM templates - Nginx configuration changed for JCR

* ARM templates - Xray ARM extension script, yq added, Rabbitmq default password added

* ARM templates - Xray, Extension script changes

* ARM templates - RT readme updated, branch for extensions scripts switched back to master

* ARM templates - JCR, updated API, best practives

* ARM templates - Nginx configuration changed for JCR

* ARM templates - MP submissions, Xray installation script changes, master key minimun char number added in JCR

* ARM templates - Parameters draft
This commit is contained in:
Daniel Miakotkin
2020-09-08 13:35:04 -07:00
committed by GitHub
parent 31a0a8b830
commit d56935b274
25 changed files with 185 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json
View File

@@ -101,7 +101,7 @@
"name": "artifactoryVersion",
"type": "Microsoft.Common.DropDown",
"label": "JFrog Container Registry-vm image version to deploy.",
"defaultValue": "7.4.3",
"defaultValue": "7.7.3",
"toolTip": "Version of JFrog Container Registry to deploy",
"constraints": {
"allowedValues": [
@@ -116,6 +116,10 @@
{
"label": "7.4.3",
"value": "7.4.3"
},
{
"label": "7.7.3",
"value": "0.0.2"
}
],
"required": true
@@ -132,7 +136,7 @@
"toolTip": "Master key for JFrog Container Registry cluster. Generate master.key using command '$openssl rand -hex 16'",
"constraints": {
"required": true,
"regex": "^[a-z0-9A-Z]{1,32}$",
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
},
"options": {

BIN
AzureResourceManager/JCR/MP_submission_7/jfrog-container-registry-artifactory-7-7-3-0.zip Normal file
View File

Binary file not shown.

37
AzureResourceManager/JCR/MP_submission_7/mainTemplate.json
View File

@@ -25,11 +25,12 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "7.4.3",
"defaultValue": "0.0.2",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3"
"7.4.3",
"0.0.2"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -213,7 +214,7 @@
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",
"name": "[variables('nsgName')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"securityRules": [
{
@@ -293,9 +294,9 @@
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"dependsOn": [
"[concat('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"addressSpace": {
@@ -317,14 +318,14 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicPrimaryName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', variables('nsgName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"ipConfigurations": [
@@ -350,7 +351,7 @@
"sku": {
"name": "Standard"
},
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"publicIPAllocationMethod": "Static",
"dnsSettings": {
@@ -362,12 +363,12 @@
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('lbName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"sku": {
"name": "Standard"
},
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
],
"tags":{
"displayName": "Load Balancer"
@@ -468,7 +469,7 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2019-06-01",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
@@ -484,7 +485,7 @@
{
"type": "Microsoft.Resources/deployments",
"name": "deploySQLDB",
"apiVersion": "2018-07-01",
"apiVersion": "2019-09-01",
"properties": {
"mode": "Incremental",
"templateLink": {
@@ -519,10 +520,10 @@
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"dependsOn": [
"[concat('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[concat('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
],
"plan": {
"name": "artifactory-jcr",

10
AzureResourceManager/JCR/MP_submission_7/nested/azureDBDeploy.json
View File

@@ -43,7 +43,7 @@
"type": "Microsoft.Sql/servers",
"kind": "v12.0",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"tags": {
"displayName": "artifactoryDB"
},
@@ -57,9 +57,9 @@
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
"type": "firewallrules",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[concat('Microsoft.Sql/servers/', parameters('db_server'))]"
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
],
"properties": {
"startIpAddress": "0.0.0.0",
@@ -71,7 +71,7 @@
"type": "databases",
"kind": "v12.0,user",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[parameters('db_server')]"
],
@@ -90,7 +90,7 @@
"outputs": {
"jdbcConnString": {
"type": "string",
"value": "[concat('jdbc:sqlserver://', reference(concat('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
"value": "[concat('jdbc:sqlserver://', reference(resourceId('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
}
}
}

52
AzureResourceManager/JCR/azuredeploy.json
View File

@@ -25,19 +25,19 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "7.4.3",
"defaultValue": "0.0.2",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3"
"7.4.3",
"0.0.2"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
}
},
"masterKey": {
"type": "string",
"defaultValue": "1ce2be4490ca2c662cb79636cf9b7b8e",
"type": "securestring",
"maxLength": 64,
"metadata": {
"description": "Master key for JFrog Container Registry cluster. Generate master.key using command '$openssl rand -hex 16'"
@@ -56,15 +56,13 @@
}
},
"certificate": {
"type": "string",
"defaultValue": "-----BEGIN CERTIFICATE----- MIIFhzCCA2+gAwIBAgIJALC4r5BQWZE4MA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNV BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRMwEQYDVQQHDApTYW50YUNsYXJh MQswCQYDVQQKDAJJVDEUMBIGA1UEAwwLKi5sb2NhbGhvc3QwHhcNMTgwMTE3MTk0 NjI4WhcNMTkwMTA4MTk0NjI4WjBaMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs aWZvcm5pYTETMBEGA1UEBwwKU2FudGFDbGFyYTELMAkGA1UECgwCSVQxFDASBgNV BAMMCyoubG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA 7KfOWDQlov8cMa8r/lcJqiWZaH9myQC74Vbe0HXsntQbcvljkjG2P7ebm5dd9Bzc sauNOJpbKf5AhFK1iwJUAkciGc1LR4k8wfWmQM3NPS8hrqrtH20zqNpdFRpNYjja JofwccPNm030GhhZkZ95TpruvmswMDwspl3jfqdcc/eiQsHcKyGnV2a+UAeoqe7J mHhmhRy1MLqAjF5U1GrUYUONA+22iRDJb4c9B91QoWvsnXpdA9NKV/mmA3/rIdx6 Ld2IPRdrIw2K5sAnXsh3bx2oCSvSfussf0x+4XDrnsaHVfjwvfNL8ECOuac2Oi/E WOp9528gOohpFAuwEt63Vl5p8/CC9m0HJDTZBKm2l5eD1kdPIj4PvP9Sn9CxGXKQ E1bxWoFxGX8EyRW0b0NK31N7b8JPZ1SoFNiB5amOMNLvR26a7cQrKumTuJeYK9Ja JaxhMXM7R0DA0Ev8ZG2xmyCygox+1KPSmJOIEpT70BFbj3rKLNqP22ET+zvPuh+2 DdgyrpHFeYkGWjMbWPjK7wJsD2zM8ccoJQfepPz8I4rT0JfrKAQgCGuGOggneaNJ KTVGNOFbj5AXdZ/Q+GvNommyRdq4J7EnqY6L+P25fo5qZ6UZ/iS0tPcvxgn0Fdhs pUPbQyQIDZyxZd3Q1lUIE38ol8P66mS2zbzf8EeOCoUCAwEAAaNQME4wHQYDVR0O BBYEFETAQM/5P7XJ8kevHFj6BPndQOFaMB8GA1UdIwQYMBaAFETAQM/5P7XJ8kev HFj6BPndQOFaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAJ1TepKv LWYhFmVQcgZwZf/qt1a1cohzJSm6da9RCnnAWC7WC/U117bgSomtrH1v0OysHFhB zBBUeBqI7+OmzAX8dhj+roKkcnFUM/IwlK1eueIIA//CWvEf/o0XExilVS2yCc9d PTpOQBXwk9QinxK36kHdBiGxa7dW0JPnOEEmuMgGORKeLy4J6Ik8iSeFY1SZVcOI +6WWvoKciPlmIeccC+6YVmkeBwhP2o5r5w/UAaO2hSnGvmm4UIj/VJv4VQu7xTUp cIfFz5NtIr80DbqcyPiEMS2ETJ4L/kO4MS5FfeEXyQuXCzmiIDVY6tE3C7+kZmK4 JzPLuWm9ndQoyQySOGfQqvlUR1+YxUdvmu3LrOS5dOA354Q36wHa4wEGUoHU/7GV fYQmmmDSDaNSpXW5PFey6scFyDBS/yYJ0H9EjYb/11HeWYj8Yv5xTWj8nhzJONC8 D6Y5ydlU4PifM2pOf88pTYpmogNwLJWXbql5I9cvMa8APo4yLVqcISU5ynsvFke+ Non+T0mHpJai/hrA9NK+s6EGC1dAX58jy61h6FhOPI1d4s/mov/KMa2t3SfZp5SF 81aR6dHvO56teiK5M1xMkrqG75zh3TMFJJLRFe9XxeB4JeN76URB3mgADOUqkBxd ibSgVqfKwOw4IujEcqMUc5mqSnbLY1Dv+oby -----END CERTIFICATE-----",
"type": "securestring",
"metadata": {
"description": "To use Artifactory as docker registry you need to provide wild card valid Certificate. Provide your SSL Certificate."
}
},
"certificateKey": {
"type": "string",
"defaultValue": "-----BEGIN PRIVATE KEY----- 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 S+j1+iUKGGhwVmhqh75q5do3+VF3XlAh -----END PRIVATE KEY-----",
"type": "securestring",
"metadata": {
"description": "Provide your SSL Certificate key"
}
@@ -144,7 +142,7 @@
"metadata": {
"description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated."
},
"defaultValue": "https://raw.githubusercontent.com/JFrogDev/JFrog-Cloud-Installers/master/AzureResourceManager/JCR/"
"defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/JCR/"
},
"_artifactsLocationSasToken": {
"type": "securestring",
@@ -190,7 +188,7 @@
"osType": {
"publisher": "jfrog",
"offer": "jfrogcontainerregistry-vm",
"sku": "artifactory-jcr-private",
"sku": "artifactory-jcr",
"version": "[parameters('artifactoryVersion')]"
},
"imageReference": "[variables('osType')]",
@@ -216,7 +214,7 @@
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",
"name": "[variables('nsgName')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"securityRules": [
{
@@ -296,9 +294,9 @@
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"dependsOn": [
"[concat('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"addressSpace": {
@@ -320,14 +318,14 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicPrimaryName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', variables('nsgName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"ipConfigurations": [
@@ -353,7 +351,7 @@
"sku": {
"name": "Standard"
},
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"publicIPAllocationMethod": "Static",
"dnsSettings": {
@@ -365,12 +363,12 @@
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('lbName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"sku": {
"name": "Standard"
},
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
],
"tags":{
"displayName": "Load Balancer"
@@ -471,7 +469,7 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2019-06-01",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
@@ -487,7 +485,7 @@
{
"type": "Microsoft.Resources/deployments",
"name": "deploySQLDB",
"apiVersion": "2018-07-01",
"apiVersion": "2019-09-01",
"properties": {
"mode": "Incremental",
"templateLink": {
@@ -522,13 +520,13 @@
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"dependsOn": [
"[concat('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[concat('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
],
"plan": {
"name": "artifactory-jcr-private",
"name": "artifactory-jcr",
"publisher": "jfrog",
"product": "jfrogcontainerregistry-vm"
},

8
AzureResourceManager/JCR/azuredeploy.parameters.json
View File

@@ -21,7 +21,13 @@
"value": "GEN-UNIQUE"
},
"masterKey": {
"value": "GEN-UNIQUE"
"value": "GENERATE_MASTER_KEY"
},
"certificate": {
"value": "-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----"
},
"certificateKey": {
"value": "-----BEGIN PRIVATE KEY----- -----END PRIVATE KEY-----"
}
}
}

18
AzureResourceManager/JCR/nested/azureDBDeploy.json
View File

@@ -1,9 +1,10 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"db_user": {
"type": "string",
"defaultValue": "artifactory",
"minLength": 1
},
"db_password": {
@@ -11,10 +12,12 @@
},
"db_server": {
"type": "string",
"defaultValue": "artmssqlsrv",
"minLength": 1
},
"db_name": {
"type": "string",
"defaultValue": "artdb",
"minLength": 1
},
"db_location": {
@@ -40,10 +43,7 @@
"type": "Microsoft.Sql/servers",
"kind": "v12.0",
"location": "[variables('db_location')]",
"apiVersion": "2015-05-01-preview",
"dependsOn": [
],
"apiVersion": "2020-02-02-preview",
"tags": {
"displayName": "artifactoryDB"
},
@@ -57,9 +57,9 @@
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
"type": "firewallrules",
"location": "[variables('db_location')]",
"apiVersion": "2015-05-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[concat('Microsoft.Sql/servers/', parameters('db_server'))]"
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
],
"properties": {
"startIpAddress": "0.0.0.0",
@@ -71,7 +71,7 @@
"type": "databases",
"kind": "v12.0,user",
"location": "[variables('db_location')]",
"apiVersion": "2015-05-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[parameters('db_server')]"
],
@@ -90,7 +90,7 @@
"outputs": {
"jdbcConnString": {
"type": "string",
"value": "[concat('jdbc:sqlserver://', reference(concat('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
"value": "[concat('jdbc:sqlserver://', reference(resourceId('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
}
}
}

51
AzureResourceManager/JCR/vm_install/install_jcr7_to_vm.sh Normal file
View File

@@ -0,0 +1,51 @@
#!/bin/bash
# Upgrade version for every release
ARTIFACTORY_VERSION=7.7.3
UBUNTU_CODENAME=$(cat /etc/lsb-release | grep "^DISTRIB_CODENAME=" | sed "s/DISTRIB_CODENAME=//")
export DEBIAN_FRONTEND=noninteractive
# install the wget and curl
apt-get update
apt-get -y install wget curl>> /tmp/install-curl.log 2>&1
#Generate Self-Signed Cert
mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/
openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost"
# install the Artifactory JCR and Nginx
echo "deb https://jfrog.bintray.com/artifactory-debs ${UBUNTU_CODENAME} main" | tee -a /etc/apt/sources.list
curl --retry 5 https://bintray.com/user/downloadSubjectPublicKey?username=jfrog | apt-key add -
apt-get update
apt-get -y install nginx>> /tmp/install-nginx.log 2>&1
apt-get -y install jfrog-artifactory-jcr=${ARTIFACTORY_VERSION} >> /tmp/install-artifactory.log 2>&1
# Add callhome metadata (allow us to collect information)
mkdir -p /var/opt/jfrog/artifactory/etc/info
cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
{
"productId": "ARM_artifactory-jcr/1.0.0",
"features": [
{
"featureId": "Partner/ACC-007221"
}
]
}
EOF
#Install database drivers (for Java 11, path is different for RT6 and RT7)
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mysql-connector-java-5.1.38.jar https://bintray.com/artifact/download/bintray/jcenter/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar >> /tmp/install-databse-driver.log 2>&1
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mssql-jdbc-7.4.1.jre11.jar https://bintray.com/artifact/download/bintray/jcenter/com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre11/mssql-jdbc-7.4.1.jre11.jar >> /tmp/install-databse-driver.log 2>&1
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1
#Configuring nginx
rm /etc/nginx/sites-enabled/default
printf "\nartifactory.ping.allowUnauthenticated=true" >> /var/opt/jfrog/artifactory/etc/artifactory/artifactory.system.properties
chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/*
# Remove Artifactory service from boot up run
systemctl disable artifactory
systemctl disable nginx