diff --git a/CHANGELOG b/CHANGELOG index 55629eb..d8d43b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ [0.1.0] * First version + +[0.1.1] +* Updated to base image 0.10.0 diff --git a/CloudronManifest.json b/CloudronManifest.json index c48a53d..2bd1c33 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -7,7 +7,7 @@ "tags": [ "webserver" ], - "version": "0.1.0", + "version": "0.1.1", "healthCheckPath": "/", "httpPort": 8000, "manifestVersion": 1, @@ -18,6 +18,8 @@ "localstorage": {} }, "mediaLinks": [ + "https://nginx.org/nginx.png" ], - "changelog": "file://CHANGELOG" + "changelog": "file://CHANGELOG", + "postInstallMessage": "file://POSTINSTALL.md" } diff --git a/DESCRIPTION.md b/DESCRIPTION.md index 063ac6d..94c0fae 100644 --- a/DESCRIPTION.md +++ b/DESCRIPTION.md @@ -1,5 +1,5 @@ ### Empty Website with Nginx + PHP. -Use `cloudron push` to copy files into `/app/data/page/` and `cloudron exec` to get a remote terminal. +Use `cloudron push` to copy files into `/app/data/public/` and `cloudron exec` to get a remote terminal. Edit `/app/data/nginx.conf` to change the webserver configuration according to the [Nginx Documentation](https://nginx.org/en/docs/). diff --git a/Dockerfile b/Dockerfile index d2ed164..622cad3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,16 @@ -FROM cloudron/base:0.9.0 +FROM cloudron/base:0.10.0 MAINTAINER Dennis Schwerdel RUN mkdir -p /app/code WORKDIR /app/code ADD nginx.conf /app/code/nginx.conf.default -ADD page /app/code/page.default +ADD public /app/code/public.default ADD fpm.conf /etc/php/7.0/fpm/php-fpm.conf ADD start.sh /app/code/start.sh RUN mkdir /run/nginx && \ + rm /var/log/nginx/*.log && \ ln -s /dev/stderr /var/log/nginx/error.log && \ ln -s /dev/stdout /var/log/nginx/access.log && \ rmdir /var/lib/nginx && ln -s /tmp /var/lib/nginx diff --git a/POSTINSTALL.md b/POSTINSTALL.md new file mode 100644 index 0000000..94c0fae --- /dev/null +++ b/POSTINSTALL.md @@ -0,0 +1,5 @@ +### Empty Website with Nginx + PHP. + +Use `cloudron push` to copy files into `/app/data/public/` and `cloudron exec` to get a remote terminal. + +Edit `/app/data/nginx.conf` to change the webserver configuration according to the [Nginx Documentation](https://nginx.org/en/docs/). diff --git a/README.md b/README.md index 35ee217..bd2d439 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# TinyTinyRSS Cloudron App +# Nginx Cloudron App -This repository contains the Cloudron app package source for [TinyTinyRSS](https://tt-rss.org/). +This repository contains the Cloudron app package source for Nginx. ## Installation -[![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=org.tt_rss.cloudronapp) +[![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=org.nginx.cloudronapp) or using the [Cloudron command line tooling](https://cloudron.io/references/cli.html) ``` -cloudron install --appstore-id org.tt_rss.cloudronapp +cloudron install --appstore-id org.nginx.cloudronapp ``` ## Building @@ -17,27 +17,8 @@ cloudron install --appstore-id org.tt_rss.cloudronapp The app package can be built using the [Cloudron command line tooling](https://cloudron.io/references/cli.html). ``` -cd tinytinyrss-app +cd nginx-app cloudron build cloudron install ``` - -## Notes - -* tt-rss now uses a rolling release model - -* tt-rss themes require a fixed version header at the top of the theme's css. - See includes/version.php in tt-rss code base (VERSION_STATIC). - -## Testing - -The e2e tests are located in the `test/` folder and require [nodejs](http://nodejs.org/). They are creating a fresh build, install the app on your Cloudron, perform tests, backup, restore and test if things are ok. - -``` -cd tinytinyrss-app/test - -npm install -USERNAME= PASSWORD= mocha --bail test.js -``` - diff --git a/medialinks/medialink_0.png b/medialinks/medialink_0.png new file mode 100644 index 0000000..1b676c0 Binary files /dev/null and b/medialinks/medialink_0.png differ diff --git a/nginx.conf b/nginx.conf index e16e830..152469d 100644 --- a/nginx.conf +++ b/nginx.conf @@ -17,35 +17,38 @@ http { server { listen 8000; - root /app/data/page; + root /app/data/public; index index.php index.html index.htm; - client_max_body_size 10m; + # Uncomment to add a redirect + #return 302 $scheme://WWW.REDIRECT.TO.COM$request_uri; - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass unix:/var/run/php-fpm.sock; - fastcgi_index index.php; - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param DOCUMENT_ROOT $document_root; - fastcgi_param SERVER_PROTOCOL $server_protocol; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on; - fastcgi_param REMOTE_ADDR $http_x_real_ip; - } + # Uncomment to enable PHP + #location ~ \.php$ { + # try_files $uri =404; + # fastcgi_pass unix:/var/run/php-fpm.sock; + # fastcgi_index index.php; + # fastcgi_param GATEWAY_INTERFACE CGI/1.1; + # fastcgi_param SERVER_SOFTWARE nginx; + # fastcgi_param QUERY_STRING $query_string; + # fastcgi_param REQUEST_METHOD $request_method; + # fastcgi_param CONTENT_TYPE $content_type; + # fastcgi_param CONTENT_LENGTH $content_length; + # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + # fastcgi_param SCRIPT_NAME $fastcgi_script_name; + # fastcgi_param REQUEST_URI $request_uri; + # fastcgi_param DOCUMENT_URI $document_uri; + # fastcgi_param DOCUMENT_ROOT $document_root; + # fastcgi_param SERVER_PROTOCOL $server_protocol; + # fastcgi_param REMOTE_PORT $remote_port; + # fastcgi_param SERVER_ADDR $server_addr; + # fastcgi_param SERVER_PORT $server_port; + # fastcgi_param SERVER_NAME $server_name; + # fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on; + # fastcgi_param REMOTE_ADDR $http_x_real_ip; + #} + # Disallow .htaccess .htpasswd etc. location ~ /\.ht { deny all; } diff --git a/page/bootstrap.min.css b/public/bootstrap.min.css similarity index 100% rename from page/bootstrap.min.css rename to public/bootstrap.min.css diff --git a/page/index.html b/public/index.html similarity index 73% rename from page/index.html rename to public/index.html index c143d00..2e2c8c9 100644 --- a/page/index.html +++ b/public/index.html @@ -12,7 +12,7 @@

Nginx

-

To get started, push some files to /app/data/page or edit /app/data/nginx.conf.

+

To get started, push some files to /app/data/public or edit /app/data/nginx.conf.


diff --git a/page/logo.png b/public/logo.png similarity index 100% rename from page/logo.png rename to public/logo.png diff --git a/page/style.css b/public/style.css similarity index 100% rename from page/style.css rename to public/style.css diff --git a/start.sh b/start.sh index c8c2c67..99d59b3 100755 --- a/start.sh +++ b/start.sh @@ -6,8 +6,8 @@ if ! [ -e "/app/data/nginx.conf" ]; then cp -a "/app/code/nginx.conf.default" "/app/data/nginx.conf" fi -if ! [ -e "/app/data/page" ]; then - cp -a "/app/code/page.default" "/app/data/page" +if ! [ -e "/app/data/public" ]; then + cp -a "/app/code/public.default" "/app/data/public" fi chown -R cloudron:cloudron /app/data