End of Line - to LF (Unix)

All files should be in LF End of Line
koson · May 26, 2016 · 7a9089a · 7a9089a
1 parent b97e102
commit 7a9089a
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 108 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,61 +1,61 @@
-FROM phusion/baseimage:0.9.15
-MAINTAINER Open Knowledge
-
-# Disable SSH
-RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
-
-ENV HOME /root
-ENV CKAN_HOME /usr/lib/ckan/default
-ENV CKAN_CONFIG /etc/ckan/default
-ENV CKAN_DATA /var/lib/ckan
-
-# Install required packages
-RUN apt-get -q -y update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
-        python-minimal \
-        python-dev \
-        python-virtualenv \
-        libevent-dev \
-        libpq-dev \
-        nginx-light \
-        apache2 \
-        libapache2-mod-wsgi \
-        postfix \
-        build-essential
-
-# Install CKAN
-RUN virtualenv $CKAN_HOME
-RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA
-RUN chown www-data:www-data $CKAN_DATA
-
-ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt
-RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt
-ADD . $CKAN_HOME/src/ckan/
-RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/
-RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini
-ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi
-
-# Configure apache
-ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf
-RUN echo "Listen 8080" > /etc/apache2/ports.conf
-RUN a2ensite ckan_default
-RUN a2dissite 000-default
-
-# Configure nginx
-ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf
-RUN mkdir /var/cache/nginx
-
-# Configure postfix
-ADD ./contrib/docker/main.cf /etc/postfix/main.cf
-
-# Configure runit
-ADD ./contrib/docker/my_init.d /etc/my_init.d
-ADD ./contrib/docker/svc /etc/service
-CMD ["/sbin/my_init"]
-
-# Volumes
-VOLUME ["/etc/ckan/default"]
-VOLUME ["/var/lib/ckan"]
-EXPOSE 80
-
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+FROM phusion/baseimage:0.9.15
+MAINTAINER Open Knowledge
+
+# Disable SSH
+RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+
+ENV HOME /root
+ENV CKAN_HOME /usr/lib/ckan/default
+ENV CKAN_CONFIG /etc/ckan/default
+ENV CKAN_DATA /var/lib/ckan
+
+# Install required packages
+RUN apt-get -q -y update
+RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
+        python-minimal \
+        python-dev \
+        python-virtualenv \
+        libevent-dev \
+        libpq-dev \
+        nginx-light \
+        apache2 \
+        libapache2-mod-wsgi \
+        postfix \
+        build-essential
+
+# Install CKAN
+RUN virtualenv $CKAN_HOME
+RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA
+RUN chown www-data:www-data $CKAN_DATA
+
+ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt
+RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt
+ADD . $CKAN_HOME/src/ckan/
+RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/
+RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini
+ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi
+
+# Configure apache
+ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf
+RUN echo "Listen 8080" > /etc/apache2/ports.conf
+RUN a2ensite ckan_default
+RUN a2dissite 000-default
+
+# Configure nginx
+ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf
+RUN mkdir /var/cache/nginx
+
+# Configure postfix
+ADD ./contrib/docker/main.cf /etc/postfix/main.cf
+
+# Configure runit
+ADD ./contrib/docker/my_init.d /etc/my_init.d
+ADD ./contrib/docker/svc /etc/service
+CMD ["/sbin/my_init"]
+
+# Volumes
+VOLUME ["/etc/ckan/default"]
+VOLUME ["/var/lib/ckan"]
+EXPOSE 80
+
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
@@ -1,19 +1,19 @@
-version: '2'
-services:
-  ckan:
-    container_name: ckan
-    image: ckan/ckan:latest
-    depends_on:
-      - db
-      - solr
-    links:
-       - db
-       - solr
-    ports:
-       - "80:80"
-  db:
-    container_name: db
-    image: ckan/postgresql:latest
-  solr:
-    container_name: solr
-    image: ckan/solr:latest
+version: '2'
+services:
+  ckan:
+    container_name: ckan
+    image: ckan/ckan:latest
+    depends_on:
+      - db
+      - solr
+    links:
+       - db
+       - solr
+    ports:
+       - "80:80"
+  db:
+    container_name: db
+    image: ckan/postgresql:latest
+  solr:
+    container_name: solr
+    image: ckan/solr:latest
diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile
@@ -1,28 +1,28 @@
-FROM solr:6.0
-MAINTAINER Open Knowledge
-
-# Enviroment
-ENV SOLR_CORE ckan
-
-# User
-USER root
-
-# Create Directories
-RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf
-RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data
-
-# Adding Files
-ADD ./solrconfig.xml \
-https://raw.githubusercontent.com/ckan/ckan/ckan-2.5.2/ckan/config/solr/schema.xml \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \
-/opt/solr/server/solr/$SOLR_CORE/conf/
-
-# Create Core.properties
-RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties
-
-# Giving ownership to Solr
-RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE
+FROM solr:6.0
+MAINTAINER Open Knowledge
+
+# Enviroment
+ENV SOLR_CORE ckan
+
+# User
+USER root
+
+# Create Directories
+RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf
+RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data
+
+# Adding Files
+ADD ./solrconfig.xml \
+https://raw.githubusercontent.com/ckan/ckan/ckan-2.5.2/ckan/config/solr/schema.xml \
+https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \
+https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \
+https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \
+https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \
+https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \
+/opt/solr/server/solr/$SOLR_CORE/conf/
+
+# Create Core.properties
+RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties
+
+# Giving ownership to Solr
+RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE