You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/07/17 20:13:07 UTC
[sling-org-apache-sling-app-cms] 02/07: Fixing a too common error
with the site object and a path problem for selinux
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 49b10cf40f172d219dad0f94f19383301422c1b5
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Jul 4 07:53:13 2018 -0400
Fixing a too common error with the site object and a path problem for
selinux
---
core/src/main/java/org/apache/sling/cms/core/models/Site.java | 1 +
vagrant/Vagrantfile | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/Site.java b/core/src/main/java/org/apache/sling/cms/core/models/Site.java
index 80ab164..a459cfe 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/Site.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/Site.java
@@ -56,6 +56,7 @@ public class Site {
@Inject
@Named(PN_CONFIG)
+ @Optional
private String config;
@Inject
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 9c5c3e6..2f3b88d 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -27,11 +27,11 @@ Vagrant.configure("2") do |config|
echo "Depedencies installed..."
setenforce 0
- cp selinux /etc/sysconfig/selinux
+ cp /vagrant_data/selinux /etc/sysconfig
echo "SELinux Disabled..."
mkdir -p /opt/sling
- wget https://repository.apache.org/content/repositories/snapshots/org/apache/sling/org.apache.sling.cms.builder/1.0.0-SNAPSHOT/org.apache.sling.cms.builder-1.0.0-20180627.025154-15.jar -O /opt/sling/org.apache.sling.cms-1.0.0.jar
+ wget https://repository.apache.org/content/repositories/snapshots/org/apache/sling/org.apache.sling.cms.builder/1.0.0-SNAPSHOT/org.apache.sling.cms.builder-1.0.0-20180628.191007-27.jar -O /opt/sling/org.apache.sling.cms-1.0.0.jar
cp /vagrant_data/start.sh /opt/sling
cp /vagrant_data/stop.sh /opt/sling
chmod +x /opt/sling/*.sh