Merge branch 'develop' into feature/vuejs

Author: DaneEveritt

.dev/docker/default_ssl.conf

@@ -11,7 +11,7 @@ server {
     listen 443 ssl http2;
     server_name <domain>;
 
-    root /var/www/pterodactyl/public;
+    root /app/public;
     index index.php;
 
     access_log /var/log/nginx/pterodactyl.app-access.log;
@@ -49,7 +49,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/run/php/pterodactyl.sock;
+        fastcgi_pass unix:/var/run/php/php-fpm7.2.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";

.dev/docker/entrypoint.sh

@@ -3,26 +3,50 @@
 
 cd /app
 
+mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php7/ \
+&& rmdir /app/storage/logs/ \
+&& chmod 777 /var/log/panel/logs/ \
+&& ln -s /var/log/panel/logs/ /app/storage/
+
 ## check for .env file and generate app keys if missing
 if [ -f /app/var/.env ]; then
-  echo "external vars exist"
+  echo "external vars exist."
   rm /app/.env
 
   ln -s /app/var/.env /app/
 else
-  echo "external vars don't exist"
+  echo "external vars don't exist."
   rm /app/.env
   touch /app/var/.env
 
   ## manually generate a key because key generate --force fails
-  echo -e "Generating key"
+  echo -e "Generating key."
   APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
   echo -e "Generated app key: $APP_KEY"
   echo -e "APP_KEY=$APP_KEY" > /app/var/.env
 
   ln -s /app/var/.env /app/
 fi
 
+echo "Checking if https is required."
+if [ -f /etc/nginx/conf.d/default.conf ]; then
+  echo "Using nginx config already in place."
+else
+  echo "Checking if letsencrypt email is set."
+  if [ -z $LE_EMAIL ]; then
+    echo "No letsencrypt email is set Failing to http."
+    cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf
+    
+  else
+    echo "writing ssl config"
+    cp .dev/docker/default_ssl.conf /etc/nginx/conf.d/default.conf
+    echo "updating ssl config for domain"
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
+    echo "generating certs"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  fi
+fi
+
 ## check for DB up before starting the panel
 echo "Checking database status."
 until nc -z -v -w30 $DB_HOST 3306
@@ -34,13 +58,13 @@ do
 done
 
 ## make sure the db is set up
-echo -e "Migrating and Seeding DB"
+echo -e "Migrating and Seeding D.B"
 php artisan migrate --force
 php artisan db:seed --force
 
 ## start cronjobs for the queue
-echo -e "Starting cron jobs"
-crond
+echo -e "Starting cron jobs."
+crond -L /var/log/crond -l 5
 
-echo -e "Starting supervisord"
+echo -e "Starting supervisord."
 exec "$@"

.phraseapp.yml

@@ -3,6 +3,34 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.12 (Derelict Dermodactylus)
+### Fixed
+* Fixes an issue with the locations API endpoint referencing an invalid namespace.
+* Fixes the `store()` function on the locations API not working due to an incorrect return typehint.
+* Fixes daemon secrets not being able to be reset on a Node.
+ 
+### Updated
+* Upgraded core to use Laravel `5.7.14`.
+
+### Added
+* Added support for opening and editing Python files through the web editor.
+
+## v0.7.11 (Derelict Dermodactylus)
+### Fixed
+* Fixes an issue with certain systems not handling an API folder that was named `API` but referenced as `Api` in the namespace.
+* TS3 egg updated to use CLI arguments correctly and have a more minimalistic installation script.
+* Terminal was not properly displaying longer lines leading to some visual inconsistency.
+* Assorted translation updates.
+* Pagination for server listing now properly respects configuration setting.
+* Client API now properly respects permissions that are set and allows subusers to access their assigned servers.
+
+### Changed
+* Removed PhraseApp integration from Panel code as it is no longer used.
+* SFTP login endpoint now returns the permissions for that user rather than requiring additional queries to get that data.
+
+### Added
+* You can now test your mail settings from the Admin CP without waiting to see if things are working correctly.
+
 ## v0.7.10 (Derelict Dermodactylus)
 ### Fixed
 * Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore.

CHANGELOG.md

@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 WORKDIR /app
 
-RUN apk add --no-cache --update ca-certificates certbot nginx dcron curl tini php7 php7-bcmath php7-common php7-dom php7-fpm php7-gd php7-mbstring php7-openssl php7-zip php7-pdo php7-phar php7-json php7-pdo_mysql php7-session php7-ctype php7-tokenizer php7-zlib php7-simplexml supervisor \
+RUN apk add --no-cache --update ca-certificates certbot nginx dcron curl tini php7 php7-bcmath php7-common php7-dom php7-fpm php7-gd php7-mbstring php7-openssl php7-zip php7-pdo php7-phar php7-json php7-pdo_mysql php7-session php7-ctype php7-tokenizer php7-zlib php7-simplexml php7-fileinfo supervisor \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 COPY . ./
@@ -15,9 +15,9 @@ RUN cp .env.example .env \
 RUN cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf \
  && cp .dev/docker/www.conf /etc/php7/php-fpm.d/www.conf \
  && cat .dev/docker/supervisord.conf > /etc/supervisord.conf \
- && echo "* * * * * /usr/bin/php /app/pterodactyl/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
- && mkdir -p /var/run/php /var/run/nginx \
- && mkdir -p /var/log/supervisord/
+ && echo "* * * * * /usr/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+ && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
+ && mkdir -p /var/run/php /var/run/nginx
 
 EXPOSE 80 443
 

Dockerfile

@@ -41,8 +41,7 @@ In addition to our standard nest of supported games, our community is constantly
 * Discord ATLBot
 
 ## Credits
-A huge thank you to [PhraseApp](https://phraseapp.com) who provide us the software to help translate this project. This software would not be possible
-without the work of other open-source authors who provide tools such as:
+This software would not be possible without the work of other open-source authors who provide tools such as:
 
 [Ace Editor](https://ace.c9.io), [AdminLTE](https://almsaeedstudio.com), [Animate.css](http://daneden.github.io/animate.css/), [AnsiUp](https://github.com/drudru/ansi_up), [Async.js](https://github.com/caolan/async), 
 [Bootstrap](http://getbootstrap.com), [Bootstrap Notify](http://bootstrap-notify.remabledesigns.com), [Chart.js](http://www.chartjs.org), [FontAwesome](http://fontawesome.io),

README.md

@@ -132,7 +132,7 @@ public function handle()
         );
 
         $selected = $this->config->get('queue.default', 'redis');
-        $this->variables['QUEUE_DRIVER'] = $this->option('queue') ?? $this->choice(
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
             trans('command/messages.environment.app.queue_driver'),
             self::ALLOWED_QUEUE_DRIVERS,
             array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -103,10 +103,10 @@ public function getDaemonServiceData(Server $server, bool $refresh = false): arr
      *
      * @param \Pterodactyl\Models\User $user
      * @param int                      $level
-     * @param bool                     $paginate
+     * @param bool|int                 $paginate
      * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection
      */
-    public function filterUserAccessServers(User $user, int $level, bool $paginate = true);
+    public function filterUserAccessServers(User $user, int $level, $paginate = 25);
 
     /**
      * Return a server by UUID.

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -263,7 +263,7 @@ public function viewServers($node)
      */
     public function updateSettings(NodeFormRequest $request, Node $node)
     {
-        $this->updateService->handle($node, $request->normalize());
+        $this->updateService->handle($node, $request->normalize(), $request->input('reset_secret') === 'on');
         $this->alert->success(trans('admin/node.notices.node_updated'))->flash();
 
         return redirect()->route('admin.nodes.view.settings', $node->id)->withInput();
@@ -289,7 +289,7 @@ public function allocationRemoveSingle(int $node, Allocation $allocation): Respo
      * Removes multiple individual allocations from a node.
      *
      * @param \Illuminate\Http\Request $request
-     * @param int $node
+     * @param int                      $node
      * @return \Illuminate\Http\Response
      *
      * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException