Skip to content

Commit 98add8f

Browse files
authored
Merge pull request #831 from tobiasge/remove-initializers
Initializers are now a plugin
2 parents ada2bd6 + 6f1d46d commit 98add8f

File tree

103 files changed

+5
-2972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+5
-2972
lines changed

β€ŽDockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py
7070
COPY docker/docker-entrypoint.sh /opt/netbox/docker-entrypoint.sh
7171
COPY docker/housekeeping.sh /opt/netbox/housekeeping.sh
7272
COPY docker/launch-netbox.sh /opt/netbox/launch-netbox.sh
73-
COPY startup_scripts/ /opt/netbox/startup_scripts/
74-
COPY initializers/ /opt/netbox/initializers/
7573
COPY configuration/ /etc/netbox/config/
7674
COPY docker/nginx-unit.json /etc/unit/
7775

β€Ždocker-compose.test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ services:
1111
SKIP_STARTUP_SCRIPTS: ${SKIP_STARTUP_SCRIPTS-false}
1212
user: 'unit:root'
1313
volumes:
14-
- ./startup_scripts:/opt/netbox/startup_scripts:z,ro
15-
- ./${INITIALIZERS_DIR-initializers}:/opt/netbox/initializers:z,ro
1614
- ./configuration:/etc/netbox/config:z,ro
1715
- ./reports:/etc/netbox/reports:z,ro
1816
- ./scripts:/etc/netbox/scripts:z,ro

β€Ždocker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ services:
1010
env_file: env/netbox.env
1111
user: 'unit:root'
1212
volumes:
13-
- ./startup_scripts:/opt/netbox/startup_scripts:z,ro
14-
- ./initializers:/opt/netbox/initializers:z,ro
1513
- ./configuration:/etc/netbox/config:z,ro
1614
- ./reports:/etc/netbox/reports:z,ro
1715
- ./scripts:/etc/netbox/scripts:z,ro

β€Ždocker/docker-entrypoint.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,13 @@ END
8080
echo "πŸ’‘ Superuser Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}"
8181
fi
8282

83-
# Run the startup scripts (and initializers)
83+
# Print warning if startup scripts (and initializers) would've been run # Remove for next release
8484
if [ "$SKIP_STARTUP_SCRIPTS" == "true" ]; then
85-
echo "↩️ Skipping startup scripts"
85+
# Nothing to do
86+
echo "" # Empty block not allowed
8687
else
87-
echo "import runpy; runpy.run_path('../startup_scripts')" | ./manage.py shell --interface python
88+
echo "⚠️⚠️⚠️ WARNING: The initializers have been moved to a plugin. See release notes."
89+
echo "⚠️⚠️⚠️ Set environment variable 'SKIP_STARTUP_SCRIPTS' to 'true' to remove this warning."
8890
fi
8991

9092
echo "βœ… Initialisation is done."

β€Ženv/netbox.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ REDIS_PASSWORD=H733Kdjndks81
3434
REDIS_SSL=false
3535
RELEASE_CHECK_URL=https://api.github.com/repos/netbox-community/netbox/releases
3636
SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
37-
SKIP_STARTUP_SCRIPTS=false
3837
SKIP_SUPERUSER=false
3938
SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567
4039
SUPERUSER_EMAIL=admin@example.com

β€Žinitializers/aggregates.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žinitializers/asns.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žinitializers/cables.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

β€Žinitializers/circuit_types.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

β€Žinitializers/circuits.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žinitializers/cluster_groups.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

β€Žinitializers/cluster_types.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

β€Žinitializers/clusters.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žinitializers/contact_groups.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žinitializers/contact_roles.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

β€Žinitializers/contacts.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

β€Žinitializers/custom_fields.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

β€Žinitializers/custom_links.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

β€Žinitializers/dcim_interfaces.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

β€Žinitializers/device_roles.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
Β (0)